x264 version bump

[Dominik 'Rathann' Mierzejewski]

On Monday, 26 October 2009 at 10:46, 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

gst-plugins-ugly needs porting to the new x264_nal_encode API:
http://git.videolan.org/?p=x264.git;a=commitdiff;h=031e25d8cc909af2d138f9fedc8252961f34a6ac

Trivial patch to fix compilation due to b_bframe_pyramid -> i_bframe_pyramid
name change attached.

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 gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c.x264 gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c
--- gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c.x264	2009-06-05 22:02:52.000000000 +0200
+++ gst-plugins-ugly-0.10.12/ext/x264/gstx264enc.c	2009-10-26 16:44:43.000000000 +0100
@@ -576,7 +576,11 @@ gst_x264_enc_init_encoder (GstX264Enc * 
   encoder->x264param.analyse.i_noise_reduction = encoder->noise_reduction;
   encoder->x264param.i_frame_reference = encoder->ref;
   encoder->x264param.i_bframe = encoder->bframes;
+#if X264_BUILD < 78
   encoder->x264param.b_bframe_pyramid = encoder->b_pyramid;
+#else
+  encoder->x264param.i_bframe_pyramid = encoder->b_pyramid;
+#endif
 #if X264_BUILD < 63
   encoder->x264param.b_bframe_adaptive = encoder->b_adapt;
 #else