generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify using FFMIN3

Browse Source 
Originally committed as revision 12983 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-04-26 12:51:52 +00:00
parent b842ecbefc
commit 5be25fc133
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpegaudiodec.c
View File

@ -2581,12 +2581,9 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
for (fr = 0; fr < s->frames; fr++) { for (fr = 0; fr < s->frames; fr++) {
start = start2; start = start2;
fsize = (start[0] << 4) | (start[1] >> 4); fsize = (start[0] << 4) | (start[1] >> 4);
fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE);
start2 += fsize; start2 += fsize;
if (fsize > len)
fsize = len;
len -= fsize; len -= fsize;
if (fsize > MPA_MAX_CODED_FRAME_SIZE)
fsize = MPA_MAX_CODED_FRAME_SIZE;
m = s->mp3decctx[fr]; m = s->mp3decctx[fr];
assert (m != NULL); assert (m != NULL);