Merge commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead'

[ffmpeg] / libavcodec / utils.c

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d473b49da2ca299506d4af6af84808e328e3970a..e279147b367ed6de4cb9bf6417a37e94e12fa212 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3067,7 +3067,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
                 return frame_bytes * 8 / bps;
         }
 
-        if (ch > 0) {
+        if (ch > 0 && ch < INT_MAX/16) {
             /* calc from frame_bytes and channels */
             switch (id) {
             case AV_CODEC_ID_ADPCM_AFC: