[FFmpeg-cvslog] r18617 - trunk/libavcodec/aac.c

Robert Swain robert.swain
Sun Apr 19 11:46:25 CEST 2009


On 19/4/09 03:46, Michael Niedermayer wrote:
> On Sun, Apr 19, 2009 at 02:55:46AM +0200, superdump wrote:
>> Author: superdump
>> Date: Sun Apr 19 02:55:46 2009
>> New Revision: 18617
>>
>> Log:
>> Remove unnecessary assignment, found by CSA.
>>
>> Modified:
>>     trunk/libavcodec/aac.c
>>
>> Modified: trunk/libavcodec/aac.c
>> ==============================================================================
>> --- trunk/libavcodec/aac.c	Sun Apr 19 00:53:37 2009	(r18616)
>> +++ trunk/libavcodec/aac.c	Sun Apr 19 02:55:46 2009	(r18617)
>> @@ -1616,7 +1616,7 @@ static int aac_decode_frame(AVCodecConte
>>       init_get_bits(&gb, buf, buf_size*8);
>>
>>       if (show_bits(&gb, 12) == 0xfff) {
>> -        if ((err = parse_adts_frame_header(ac,&gb))<  0) {
>> +        if (parse_adts_frame_header(ac,&gb)<  0) {
>>               av_log(avccontext, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
>>               return -1;
>>           }
>
> withot looking at the code id say
>
> return err would be more correct

Possibly. I was unsure and thought this option was 'safer' until I got 
chance to look at how the return of *decode_frame() is handled, which I 
shall do shortly.

There is also some code, related to parse_adts_frame_header(), to print 
more appropriate error messages based on some defined 'error codes' in 
the ac3 parser. I'll probably post a patch to make this into a function 
and share it between AAC and AC-3.

Regards,
Rob



More information about the ffmpeg-cvslog mailing list