From 136901567c44a653485b5e97caff4fee09424b18 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Tue, 15 Feb 2011 11:58:51 +0000 Subject: [PATCH] binkaudio: fix channel count check Perform validity check on AVFormatContext.channels instead of uninitialised field. This fixes issue 2001. Signed-off-by: Mans Rullgard (cherry picked from commit 9806fbd5351fa84f99fa5b18fe06859acb514f34) --- libavcodec/binkaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 53484654db..ae3db5d6c7 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; }