# HG changeset patch # User bcoudurier # Date 1209214312 0 # Node ID 85cb0c3f8e54b23ca97f13f2c4791c634ab0ad4d # Parent 91f5a23d6cd54d1c9ac1307ef56110fd4f90eb1b simplify using FFMIN3 diff -r 91f5a23d6cd5 -r 85cb0c3f8e54 mpegaudiodec.c --- a/mpegaudiodec.c Sat Apr 26 12:39:45 2008 +0000 +++ b/mpegaudiodec.c Sat Apr 26 12:51:52 2008 +0000 @@ -2581,12 +2581,9 @@ 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);