]>
Commit | Line | Data |
---|---|---|
3e659177 | 1 | 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 |
2 | --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 | |
3 | +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 | |
4 | @@ -488,8 +488,10 @@ | |
5 | printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8); | |
6 | printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter); | |
7 | printf("[x264] b_cabac = %d\n", x264Param->b_cabac); | |
8 | -#if X264_BUILD > 101 | |
9 | +#if X264_BUILD > 101 && X264_BUILD < 115 | |
10 | printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop); | |
11 | +#elif X264_BUILD > 114 | |
12 | + printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop); | |
13 | #endif | |
14 | printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced); | |
15 | #if X264_BUILD > 88 | |
16 | 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 | |
17 | --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 | |
18 | +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 | |
19 | @@ -417,7 +417,7 @@ | |
20 | _param.b_cabac = cabac; | |
21 | } | |
22 | ||
23 | -#if X264_BUILD > 101 | |
24 | +#if X264_BUILD > 101 && X264_BUILD < 115 | |
25 | unsigned int x264Options::getOpenGopMode(void) | |
26 | { | |
27 | return _param.i_open_gop; | |
28 | @@ -428,6 +428,17 @@ | |
29 | if (openGopMode < 3) | |
30 | _param.i_open_gop = openGopMode; | |
31 | } | |
32 | +#elif X264_BUILD > 114 | |
33 | +unsigned int x264Options::getOpenGopMode(void) | |
34 | +{ | |
35 | + return _param.b_open_gop; | |
36 | +} | |
37 | + | |
38 | +void x264Options::setOpenGopMode(unsigned int openGopMode) | |
39 | +{ | |
40 | + if (openGopMode < 3) | |
41 | + _param.b_open_gop = openGopMode; | |
42 | +} | |
43 | #endif | |
44 | ||
45 | unsigned int x264Options::getInterlaced(void) |