aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2011-02-15 11:58:51 +0000
committerMans Rullgard <mans@mansr.com>2011-02-15 14:20:19 +0000
commit9806fbd5351fa84f99fa5b18fe06859acb514f34 (patch)
treea7a805cbdcec74cc74f4e879960b0d7f9c1b6b80
parentd06497f316ed819ea0ca0fad2535342ec42c79a5 (diff)
downloadffmpeg-9806fbd5351fa84f99fa5b18fe06859acb514f34.tar.gz
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@mansr.com>
-rw-r--r--libavcodec/binkaudio.c4
1 files 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;
}