x264 version bump

[Dominik 'Rathann' Mierzejewski]

On Monday, 26 October 2009 at 14:42, Dominik 'Rathann' Mierzejewski wrote:
> On Monday, 26 October 2009 at 14:37, Stewart Adam wrote:
> > On 2009/10/26 5:46 AM, Dominik 'Rathann' Mierzejewski wrote:
> > >Hi.
> > >
> > >In the last three weeks there have been two ABI changes in x264.
> > >Current FFmpeg already requires the latest x264, so I can't update
> > >it past 20091019 snapshot without updating x264 as well.
> > >I'm going to try and rebuild all packages depending on x264 to see
> > >if they still build locally, but I'd like some feedback from the
> > >maintainers of:
> > >avidemux
> > >gstreamer-plugins-ugly
> > >libquicktime
> > >vlc
> > 
> > It's fine by me... TBH I don't care much about avidemux anymore. I've made 
> > multiple attempts to contact upstream to inform them of problems or even 
> > send patches and received no response, compile errors are frequent and it 
> > bundles (in some cases, rather outdated) copies many libraries internally.
> > 
> > I'll continue maintaining it, but if it's broken, it's broken - I'll just 
> > wait for the next upstream release (or Gentoo patch, whatever comes first).

FYI current rawhide avidemux doesn't build with the new x264. It needs at least
the attached patch.

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.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp.x264 avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
--- avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp.x264	2009-10-01 08:10:45.000000000 +0200
+++ avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2009-10-27 12:29:33.000000000 +0100
@@ -625,7 +625,11 @@ void x264Encoder::printParam(x264_param_
 	printf("[x264] i_bframe = %d\n", x264Param->i_bframe);
 	printf("[x264] i_bframe_bias = %d\n", x264Param->i_bframe_bias);
 	printf("[x264] i_frame_reference = %d\n", x264Param->i_frame_reference);
+#if X264_BUILD >= 78
+	printf("[x264] b_bframe_pyramid = %d\n", x264Param->i_bframe_pyramid);
+#else
 	printf("[x264] b_bframe_pyramid = %d\n", x264Param->b_bframe_pyramid);
+#endif
 #if X264_BUILD >= 63
 	printf("[x264] i_bframe_adaptive = %d\n", x264Param->i_bframe_adaptive);
 #else
diff -up avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp.x264 avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp.x264	2009-10-27 13:52:22.000000000 +0100
+++ avidemux-2.5.1-20091010svn-r5371/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2009-10-27 13:55:40.000000000 +0100
@@ -330,12 +330,20 @@ void x264Options::setBFrameBias(int bFra
 
 bool x264Options::getBFrameReferences(void)
 {
+#if X264_BUILD >= 78
+	return _param.i_bframe_pyramid;
+#else
 	return _param.b_bframe_pyramid;
+#endif
 }
 
 void x264Options::setBFrameReferences(bool bFrameReferences)
 {
+#if X264_BUILD >= 78
+	_param.i_bframe_pyramid = bFrameReferences;
+#else
 	_param.b_bframe_pyramid = bFrameReferences;
+#endif
 }
 
 bool x264Options::getLoopFilter(void)