Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'

* commit 'c7921a480467876ece06566e0efd8f6bce9d1903':
  libfdk-aacdec: Fix a boundary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-11 01:44:04 +01:00
commit 66daf3b811

View File

@ -100,7 +100,7 @@ static int get_stream_info(AVCodecContext *avctx)
for (i = 0; i < info->numChannels; i++) { for (i = 0; i < info->numChannels; i++) {
AUDIO_CHANNEL_TYPE ctype = info->pChannelType[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"); av_log(avctx, AV_LOG_WARNING, "unknown channel type\n");
break; break;
} }