[FFmpeg-cvslog] r19196 - trunk/ffmpeg.c

[Baptiste Coudurier]

Hi Michael,

On 6/16/2009 1:15 PM, Michael Niedermayer wrote:
> On Mon, Jun 15, 2009 at 01:55:25AM +0200, bcoudurier wrote:
>> Author: bcoudurier
>> Date: Mon Jun 15 01:55:25 2009
>> New Revision: 19196
>>
>> Log:
>> do not use av_parser_change for h264 which uses bitstream filter, fix #1027
>>
>> Modified:
>>    trunk/ffmpeg.c
>>
>> Modified: trunk/ffmpeg.c
>> ==============================================================================
>> --- trunk/ffmpeg.c	Mon Jun 15 01:14:56 2009	(r19195)
>> +++ trunk/ffmpeg.c	Mon Jun 15 01:55:25 2009	(r19196)
>> @@ -1407,8 +1407,13 @@ static int output_packet(AVInputStream *
>>                          opkt.flags= pkt->flags;
>>  
>>                          //FIXME remove the following 2 lines they shall be replaced by the bitstream filters
>> +                        if(ost->st->codec->codec_id != CODEC_ID_H264) {
>>                          if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY))
>>                              opkt.destruct= av_destruct_packet;
>> +                        } else {
>> +                            opkt.data = data_buf;
>> +                            opkt.size = data_size;
>> +                        }
>>  
> 
> did i approve this ?

Are you against ? Relax a bit :)

> either way the comment just mentions what is changed not why

Not every codecs using av_parser_change have been changed so because
H264 uses bistream filters, it's better to disable it for H264.

I'll update the commit message

-- 
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer                                  http://www.ffmpeg.org