summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegaudiodec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 3d071627be..dcc9332970 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2581,12 +2581,9 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
for (fr = 0; fr < s->frames; fr++) {
start = start2;
fsize = (start[0] << 4) | (start[1] >> 4);
+ fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE);
start2 += fsize;
- if (fsize > len)
- fsize = len;
len -= fsize;
- if (fsize > MPA_MAX_CODED_FRAME_SIZE)
- fsize = MPA_MAX_CODED_FRAME_SIZE;
m = s->mp3decctx[fr];
assert (m != NULL);