Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Dec 2014 00:44:04 +0000 (01:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Dec 2014 00:46:11 +0000 (01:46 +0100)
* commit 'c7921a480467876ece06566e0efd8f6bce9d1903':
  libfdk-aacdec: Fix a boundary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libfdk-aacdec.c

index 90cd956..e66e6f9 100644 (file)
@@ -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;
         }