[FFmpeg-cvslog] mace: Make sure that the channel count is set to a valid value

[Martin Storsjö]

ffmpeg | branch: release/1.1 | Martin Storsjö <martin at martin.st> | Mon Sep 16 15:19:52 2013 +0300| [9272aa469848cdd6516050e702acac6ecd1ed9cd] | committer: Luca Barbato

mace: Make sure that the channel count is set to a valid value

Also return a proper error code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit e1f3847f860a1094a46be4c5f10db8df616c3135)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

Conflicts:
	libavcodec/mace.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9272aa469848cdd6516050e702acac6ecd1ed9cd
---

 libavcodec/mace.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index c78a207..5074e4b 100644
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -229,8 +229,8 @@ static av_cold int mace_decode_init(AVCodecContext * avctx)
 {
     MACEContext *ctx = avctx->priv_data;
 
-    if (avctx->channels > 2)
-        return -1;
+    if (avctx->channels > 2 || avctx->channels < 1)
+        return AVERROR(EINVAL);
     avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
 
     avcodec_get_frame_defaults(&ctx->frame);