Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'

* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135': mace: Make sure that the channel count is set to a valid value Conflicts: libavcodec/mace.c See: 6df1cfa Merged-by: Michael Niedermayer <[email protected]>
SaschaVasarrhelyi · Sep 17, 2013 · 7163bbe · 7163bbe
2 parents a64b995 + e1f3847
commit 7163bbe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libavcodec/mace.c b/libavcodec/mace.c
@@ -226,8 +226,8 @@ static void chomp6(ChannelData *chd, int16_t *output, uint8_t val, int tab_idx)
 
 static av_cold int mace_decode_init(AVCodecContext * avctx)
 {
-    if (avctx->channels > 2 || avctx->channels <= 0)
-        return -1;
+    if (avctx->channels > 2 || avctx->channels < 1)
+        return AVERROR(EINVAL);
     avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 
     return 0;