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

[Michael Niedermayer]

On Tue, Jun 16, 2009 at 02:05:56PM -0700, Baptiste Coudurier wrote:
> 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 ?

yes, the correct fix probably would be to improve the AVParser split API
short of that a check for mov vs raw h264 in the h264 split would also do
this one really is buggy, as its a workaround in one application,
is ffmpeg.c the only app using av_parser_change(), i doubt it

that is, if i guessed correctly which bug this is supposed to fix ...

> Relax a bit :)

iam very relaxed watching you sit in a pot with water that is standing
on a big pile of wood ;)

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20090617/8ee6dba9/attachment.pgp>