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
> libquicktime

libquicktime also needs a patch to build (attached) and it needs porting
to the new API as well (like gst-plugins-ugly and avidemux).

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 libquicktime-1.1.3/plugins/x264/x264.c.x264 libquicktime-1.1.3/plugins/x264/x264.c
--- libquicktime-1.1.3/plugins/x264/x264.c.x264	2009-03-11 15:25:50.000000000 +0100
+++ libquicktime-1.1.3/plugins/x264/x264.c	2009-10-27 15:55:20.000000000 +0100
@@ -67,7 +67,11 @@ static void dump_params(x264_param_t * p
   lqt_dump("  i_bframe:                    %d\n", params->i_bframe);          // 0.. X264_BFRAME_MAX
   lqt_dump("  b_bframe_adaptive:           %d\n", params->b_bframe_adaptive);
   lqt_dump("  i_bframe_bias:               %d\n", params->i_bframe_bias);
+#if X264_BUILD >= 78
+  lqt_dump("  i_bframe_pyramid:            %d\n", params->i_bframe_pyramid);
+#else
   lqt_dump("  b_bframe_pyramid:            %d\n", params->b_bframe_pyramid);
+#endif
   
   lqt_dump("  b_deblocking_filter:         %d\n", params->b_deblocking_filter);
   lqt_dump("  i_deblocking_filter_alphac0: %d\n", params->i_deblocking_filter_alphac0); // -6..6
@@ -782,7 +786,11 @@ static int set_parameter(quicktime_t *fi
   ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives);
 #endif
   INTPARAM("x264_i_bframe_bias", codec->params.i_bframe_bias);
+#if X264_BUILD >= 78
+  INTPARAM("x264_i_bframe_pyramid", codec->params.i_bframe_pyramid);
+#else
   INTPARAM("x264_b_bframe_pyramid", codec->params.b_bframe_pyramid);
+#endif
 
   ENUMPARAM("x264_i_rc_method", codec->params.rc.i_rc_method, rc_methods);
   INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);