rpms/gstreamer-plugins-ugly/F-12 gst-plugins-ugly-old-x264.patch, NONE, 1.1 gstreamer-plugins-ugly.spec, 1.23, 1.24

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/gstreamer-plugins-ugly/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9773

Modified Files:
	gstreamer-plugins-ugly.spec 
Added Files:
	gst-plugins-ugly-old-x264.patch 
Log Message:
* Sun Jun 13 2010 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.15-1
- New upstream release 0.10.15


gst-plugins-ugly-old-x264.patch:
 gstx264enc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gst-plugins-ugly-old-x264.patch ---
>From 2339add6d5ca87aaeb7ca612f1b2326a8819d26e Mon Sep 17 00:00:00 2001
From: Olivier Crête <olivier.crete at collabora.co.uk>
Date: Mon, 31 May 2010 20:57:42 +0000
Subject: x264enc: Only set i_weighted_pred on versions where it exists

---
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index c3c64a5..b717d01 100644
--- a/ext/x264/gstx264enc.c
+++ b/ext/x264/gstx264enc.c
@@ -594,7 +594,9 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder)
   encoder->x264param.analyse.inter = encoder->analyse;
   encoder->x264param.analyse.b_transform_8x8 = encoder->dct8x8;
   encoder->x264param.analyse.b_weighted_bipred = encoder->weightb;
+#if X264_BUILD > 78
   encoder->x264param.analyse.i_weighted_pred = 0;
+#endif
   encoder->x264param.analyse.i_noise_reduction = encoder->noise_reduction;
   encoder->x264param.i_frame_reference = encoder->ref;
   encoder->x264param.i_bframe = encoder->bframes;
--
cgit v0.8.3-6-g21f6


Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/F-12/gstreamer-plugins-ugly.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gstreamer-plugins-ugly.spec	14 Jun 2010 11:25:01 -0000	1.23
+++ gstreamer-plugins-ugly.spec	18 Jun 2010 07:58:12 -0000	1.24
@@ -16,6 +16,7 @@
 Group: Applications/Multimedia
 URL: http://gstreamer.freedesktop.org/
 Source: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.bz2
+Patch0: gst-plugins-ugly-old-x264.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: %{gstreamer} >= %{gst_minver}
 BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@@ -74,6 +75,7 @@
 
 %prep
 %setup -q -n gst-plugins-ugly-%{version}
+%patch0 -p1
 
 
 %build