rpms/avidemux/devel avidemux-2.5.5-x264_i_to_b_open_gop.patch, NONE, 1.1 avidemux.spec, 1.50, 1.51

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31913

Modified Files:
	avidemux.spec 
Added Files:
	avidemux-2.5.5-x264_i_to_b_open_gop.patch 
Log Message:
* Fri Jul 15 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-3
- Add patch to fix x264 ABI 115 change (#1848)


avidemux-2.5.5-x264_i_to_b_open_gop.patch:
 encoder.cpp     |    4 +++-
 x264Options.cpp |   14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

--- NEW FILE avidemux-2.5.5-x264_i_to_b_open_gop.patch ---
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2010-10-03 11:54:51.000000000 -0500
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-07-15 10:58:18.970492678 -0500
@@ -488,8 +488,10 @@
 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
+#elif X264_BUILD > 114
+        printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
 #endif
 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
 #if X264_BUILD > 88
diff -Naur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2010-12-31 15:23:09.000000000 -0600
+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-07-15 11:00:32.108021056 -0500
@@ -417,7 +417,7 @@
 	_param.b_cabac = cabac;
 }
 
-#if X264_BUILD > 101
+#if X264_BUILD > 101 && X264_BUILD < 115
 unsigned int x264Options::getOpenGopMode(void)
 {
 	return _param.i_open_gop;
@@ -428,6 +428,18 @@
 	if (openGopMode < 3)
 		_param.i_open_gop = openGopMode;
 }
+
+#elif X264_BUILD > 114
+unsigned int x264Options::getOpenGopMode(void)
+{
+        return _param.b_open_gop;
+}
+
+void x264Options::setOpenGopMode(unsigned int openGopMode)
+{
+        if (openGopMode < 3)
+                _param.b_open_gop = openGopMode;
+}
 #endif
 
 unsigned int x264Options::getInterlaced(void)


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avidemux.spec	14 Jul 2011 22:06:46 -0000	1.50
+++ avidemux.spec	15 Jul 2011 17:22:39 -0000	1.51
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -48,6 +48,8 @@
 Patch10:        avidemux-2.5.4-libmad.patch
 Patch11:        avidemux-2.5.4-libtwolame.patch
 Patch12:        avidemux-2.5.5_fix_lav_audio_encoder.patch
+# Fix for x264 ABI 115 change.
+Patch13:        avidemux-2.5.5-x264_i_to_b_open_gop.patch 
 # Uses a header file not found in the standard package
 #Patch16:        avidemux-2.5.4-mpeg2enc.patch
 
@@ -213,6 +215,7 @@
 %patch10 -p1 -b .libmad
 %patch11 -p1 -b .libtwolame
 %patch12 -p1 -b .lavencode
+%patch13 -p1 -b .x264plugin
 
 
 %build
@@ -321,6 +324,9 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Fri Jul 15 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-3
+- Add patch to fix x264 ABI 115 change (#1848)
+
 * Fri Jul 15 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.5.5-2
 - Rebuilt for x264 ABI 115