[FFmpeg-devel] [PATCH] uniformize trellis quant options

[Michael Niedermayer]

On Sat, Jun 07, 2008 at 05:05:22PM -0700, Baptiste Coudurier wrote:
> Michael Niedermayer wrote:
> > On Tue, Jun 03, 2008 at 06:43:46PM -0700, Baptiste Coudurier wrote:
> >> Hi,
> >>
> >> $subject.
> >>
> >> I did not suceeded in setting ->trellis with -flags +trell
> >> unfortunately, is there a way ?
> > [...]
> >> +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
> >>  #define CODEC_FLAG_TRELLIS_QUANT  0x00200000 ///< Use trellis quantization.
> >> +#endif
> >>  #define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
> >>  #define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).
> >>  /* Fx : Flag for h263+ extra options */
> >> Index: libavcodec/mpegvideo_enc.c
> >> ===================================================================
> >> --- libavcodec/mpegvideo_enc.c	(revision 13650)
> >> +++ libavcodec/mpegvideo_enc.c	(working copy)
> >> @@ -332,6 +332,9 @@
> >>      s->intra_vlc_format= !!(s->flags2 & CODEC_FLAG2_INTRA_VLC);
> >>      s->q_scale_type= !!(s->flags2 & CODEC_FLAG2_NON_LINEAR_QUANT);
> >>  
> >> +    if (avctx->trellis)
> >> +        s->flags |= CODEC_FLAG_TRELLIS_QUANT;
> >> +
> > 
> > that will break when the #if becomes false
> > 
> 
> Yeah, sorry patch was crap. Patch updated with libxvid modifications.

looks ok

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If a bugfix only changes things apparently unrelated to the bug with no
further explanation, that is a good sign that the bugfix is wrong.
-------------- 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-devel/attachments/20080608/2d0b13d4/attachment.pgp>