[FFmpeg-cvslog] r12983 - trunk/libavcodec/mpegaudiodec.c

[bcoudurier]

Author: bcoudurier
Date: Sat Apr 26 14:51:52 2008
New Revision: 12983

Log:
simplify using FFMIN3

Modified:
   trunk/libavcodec/mpegaudiodec.c

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	(original)
+++ trunk/libavcodec/mpegaudiodec.c	Sat Apr 26 14:51:52 2008
@@ -2581,12 +2581,9 @@ static int decode_frame_mp3on4(AVCodecCo
     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);