blob: c627667ecdf9c7b06dbb63c2639d8da2593ef3bf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
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)
|
