summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/avidemux2/files/patch-x264_encoder.cpp14
-rw-r--r--multimedia/avidemux2/files/patch-x264_x264Options.cpp29
2 files changed, 43 insertions, 0 deletions
diff --git a/multimedia/avidemux2/files/patch-x264_encoder.cpp b/multimedia/avidemux2/files/patch-x264_encoder.cpp
new file mode 100644
index 000000000000..fb3116571a08
--- /dev/null
+++ b/multimedia/avidemux2/files/patch-x264_encoder.cpp
@@ -0,0 +1,14 @@
+--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp.orig 2011-06-24 13:04:17.000000000 +0200
++++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-06-24 13:05:22.000000000 +0200
+@@ -488,8 +488,10 @@ void x264Encoder::printParam(x264_param_
+ 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);
++#else 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 --git a/multimedia/avidemux2/files/patch-x264_x264Options.cpp b/multimedia/avidemux2/files/patch-x264_x264Options.cpp
new file mode 100644
index 000000000000..d66aae80d638
--- /dev/null
+++ b/multimedia/avidemux2/files/patch-x264_x264Options.cpp
@@ -0,0 +1,29 @@
+--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp.orig 2011-06-24 13:05:41.000000000 +0200
++++ plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-06-24 13:07:55.000000000 +0200
+@@ -417,7 +417,7 @@ void x264Options::setCabac(bool cabac)
+ _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 @@ void x264Options::setOpenGopMode(unsigne
+ if (openGopMode < 3)
+ _param.i_open_gop = openGopMode;
+ }
++#else 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)