summaryrefslogtreecommitdiffstats
path: root/libavcodec/libfdk-aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-11 01:44:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-11 01:46:11 +0100
commit66daf3b81154078852a049b44fc477d5195cd0f5 (patch)
treee5bffa054ee11c7e2e921d5c454261aaad7f1903 /libavcodec/libfdk-aacdec.c
parent2a428db5e2c1d10ff5a7d5e8352eef8d195d440c (diff)
parentc7921a480467876ece06566e0efd8f6bce9d1903 (diff)
downloadffmpeg-streaming-66daf3b81154078852a049b44fc477d5195cd0f5.zip
ffmpeg-streaming-66daf3b81154078852a049b44fc477d5195cd0f5.tar.gz
Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'
* commit 'c7921a480467876ece06566e0efd8f6bce9d1903': libfdk-aacdec: Fix a boundary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
-rw-r--r--libavcodec/libfdk-aacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index 90cd956..e66e6f9 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -100,7 +100,7 @@ static int get_stream_info(AVCodecContext *avctx)
for (i = 0; i < info->numChannels; i++) {
AUDIO_CHANNEL_TYPE ctype = info->pChannelType[i];
- if (ctype <= ACT_NONE || ctype > FF_ARRAY_ELEMS(channel_counts)) {
+ if (ctype <= ACT_NONE || ctype >= FF_ARRAY_ELEMS(channel_counts)) {
av_log(avctx, AV_LOG_WARNING, "unknown channel type\n");
break;
}
OpenPOWER on IntegriCloud