rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly-x264.patch, NONE, 1.1 gstreamer-plugins-ugly.spec, 1.19, 1.20

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26032

Modified Files:
	gstreamer-plugins-ugly.spec 
Added Files:
	gstreamer-plugins-ugly-x264.patch 
Log Message:
* Fri Nov 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.10.12-4
- Fix compilation against current x264


gstreamer-plugins-ugly-x264.patch:

--- NEW FILE gstreamer-plugins-ugly-x264.patch ---
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


Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gstreamer-plugins-ugly.spec	20 Oct 2009 05:00:23 -0000	1.19
+++ gstreamer-plugins-ugly.spec	6 Nov 2009 13:08:26 -0000	1.20
@@ -11,12 +11,13 @@
 Summary: GStreamer streaming media framework "ugly" plug-ins
 Name: gstreamer-plugins-ugly
 Version: 0.10.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
 Source: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.bz2
 Patch0: gstreamer-plugins-ugly-opencore-amr.patch
+Patch1: gstreamer-plugins-ugly-x264.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{gstreamer} >= %{gst_minver}
 BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@@ -62,6 +63,7 @@
 %setup -q -n gst-plugins-ugly-%{version}
 mkdir ext/amrwbdec
 %patch0 -p1 -z .amr
+%patch1 -p1 -b .x264
 ./autogen.sh
 
 
@@ -115,6 +117,9 @@
 
 
 %changelog
+* Fri Nov 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.10.12-4
+- Fix compilation against current x264
+
 * Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.10.12-3
 - rebuilt