From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Mon, 19 Dec 2011 14:45:17 +0000 (-0500)
Subject: adxenc: log an error message and return AVERROR(EINVAL) for invalid channels
X-Git-Tag: android-x86-4.4-r1~8529^2~3928
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cc40c056d01a95b0a57950d4d8aec9e86060c6b6;p=android-x86%2Fexternal-ffmpeg.git

adxenc: log an error message and return AVERROR(EINVAL) for invalid channels
---

diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index cff5bb8dd7..a580bb3bc0 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -101,8 +101,10 @@ static av_cold int adx_encode_init(AVCodecContext *avctx)
 {
     ADXContext *c = avctx->priv_data;
 
-    if (avctx->channels > 2)
-        return -1;
+    if (avctx->channels > 2) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n");
+        return AVERROR(EINVAL);
+    }
     avctx->frame_size = 32;
 
     avctx->coded_frame = avcodec_alloc_frame();