[FFmpeg-cvslog] binkaudio: fix channel count check

Peter Ross git
Tue Feb 15 16:59:37 CET 2011


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Tue Feb 15 11:58:51 2011 +0000| [136901567c44a653485b5e97caff4fee09424b18] | committer: Michael Niedermayer

binkaudio: fix channel count check

Perform validity check on AVFormatContext.channels instead of
uninitialised field.

This fixes issue 2001.

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 9806fbd5351fa84f99fa5b18fe06859acb514f34)

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

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

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 5348465..ae3db5d 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -85,8 +85,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
     }
     s->frame_len = 1 << frame_len_bits;
 
-    if (s->channels > MAX_CHANNELS) {
-        av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels);
+    if (avctx->channels > MAX_CHANNELS) {
+        av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels);
         return -1;
     }
 




More information about the ffmpeg-cvslog mailing list