x264 and ffmpeg updates coming to rawhide

[Dominik 'Rathann' Mierzejewski]

On Thursday, 04 December 2008 at 21:31, Dominik 'Rathann' Mierzejewski wrote:
> On Thursday, 04 December 2008 at 21:15, Dominik 'Rathann' Mierzejewski wrote:
> > On Thursday, 04 December 2008 at 14:17, Dominik 'Rathann' Mierzejewski wrote:
> > > On Wednesday, 03 December 2008 at 19:06, Dominik 'Rathann' Mierzejewski wrote:
> > > > In the long-standing tradition of breaking stuff right after a new release,
> > > > I'm going to update x264 and ffmpeg in the devel branch.
> > > > 
> > > > x264 brings ABI and API changes (albeit minor). I haven't checked ffmpeg
> > > > yet, but there's certainly an ABI version bump in libavcodec and probably
> > > > some API changes as well.
> > > > 
> > > > Right now x264 is blocked on some ppc compilation issue which I'm currently
> > > > trying to fix with the help of one x264 developer. I'll keep you posted.
> > > 
> > > OK, x264 build succeeded. Could someone test it on ppc/ppc64?
> > 
> > ffmpeg build coming soon, too. It brings libavcodec ABI version bump and some
> > API changes.
> 
> Affected packages:
[...]
> avidemux

This needs a proper fix, but for now the attached patch makes it build.

Also, it seems to me that avidemux contains local copies of several ffmpeg
libraries: libavcodec, libavformat, libavutil, libpostproc and libswscale.
Could it be patched to use our externally packaged ones?

Regards,
R.

-- 
Fedora http://fedoraproject.org/wiki/User:Rathann
RPMFusion http://rpmfusion.org | MPlayer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
diff -up avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp.x264 avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp
--- avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp.x264	2008-07-21 19:24:20.000000000 +0200
+++ avidemux_2.4.3/avidemux/ADM_codecs/ADM_x264.cpp	2008-12-14 23:02:00.000000000 +0100
@@ -109,8 +109,7 @@ uint8_t X264Encoder::preamble (uint32_t 
   MKPARAM(i_bframe,MaxBFrame);
   MKPARAM(i_bframe_bias,Bias);
   MKPARAM( b_bframe_pyramid,BasReference );
-  MKPARAM(analyse. b_bidir_me,BidirME );
-  MKPARAM( b_bframe_adaptive, Adaptative);
+  MKPARAM( i_bframe_adaptive, Adaptative);
   MKPARAM( analyse.b_weighted_bipred, Weighted);
   MKPARAM( b_cabac , CABAC);
   MKPARAM( analyse.i_trellis, Trellis);
@@ -123,7 +122,6 @@ uint8_t X264Encoder::preamble (uint32_t 
       parity=(zparam->PartitionDecision+1-MIN_RDO)&1;
       
       param.analyse.i_subpel_refine=rank;
-      param.analyse.b_bframe_rdo=parity;
   }
   MKPARAM(analyse.b_chroma_me,ChromaME);
   MKPARAM(b_deblocking_filter,DeblockingFilter);