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

[Måns Rullgård]

Baptiste Coudurier wrote:
> Hi Benoit,
>
> Benoit Fouet wrote:
>> bcoudurier wrote:
>>> 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;
>>>
>>
>> shouldn't those two last lines be swapped ?
>>
>
> Why that ? Besides code has changed again.

The code doesn't do the same thing after this change.  Previously, start2
was incremented with the value of fsize before clamping, now it's done
after.  I haven't tried to figure out which is correct.

-- 
M?ns Rullg?rd
mans at mansr.com