From 3e659177b9416e174b02e8aefa56b148918aa4cf Mon Sep 17 00:00:00 2001 From: lisu Date: Mon, 4 Jul 2011 17:36:11 +0000 Subject: [PATCH] - fix build with new x264 Changed files: avidemux-x264.patch -> 1.3 avidemux.spec -> 1.95 --- avidemux-x264.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ avidemux.spec | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 avidemux-x264.patch diff --git a/avidemux-x264.patch b/avidemux-x264.patch new file mode 100644 index 0000000..3a641dc --- /dev/null +++ b/avidemux-x264.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -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 -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -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,17 @@ + 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) diff --git a/avidemux.spec b/avidemux.spec index 0a51ff2..4d62f4c 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -29,6 +29,7 @@ Source2: %{name}-qt4.desktop Patch0: gcc44.patch Patch1: types.patch Patch2: mmx-asm.patch +Patch3: %{name}-x264.patch #Patch1: %{name}-dts_internal.patch #Patch2: %{name}-sparc64.patch URL: http://fixounet.free.fr/avidemux/ @@ -104,6 +105,7 @@ find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -nam %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 echo 'pt_BR' >> po/LINGUAS -- 2.44.0