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
46
47
|
From: Sabourin Gilles <gilles.sabourin@free.fr>
Date: Wed, 11 Mar 2009 23:05:53 +0000 (+0100)
Subject: x264 Removed pre-scenecut definitions for build 67
X-Git-Tag: 1.0.0-pre1~136
X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=8f601a32ed1086f0b9d0046b62ab7c6ad525e0b3
x264 Removed pre-scenecut definitions for build 67
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index b2ddf23..0be0824 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -75,7 +75,7 @@ static void Close( vlc_object_t * );
"I-frames are inserted only every other keyint frames, which probably " \
"leads to ugly encoding artifacts. Range 1 to 100." )
-#if X264_BUILD >= 55 /* r607 */
+#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
#define PRESCENE_TEXT N_("Faster, less precise scenecut detection" )
#define PRESCENE_LONGTEXT N_( "Faster, less precise scenecut detection. " \
"Required and implied by multi-threading." )
@@ -434,7 +434,7 @@ vlc_module_begin ()
SCENE_LONGTEXT, false )
change_integer_range( -1, 100 )
-#if X264_BUILD >= 55 /* r607 */
+#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
PRESCENE_LONGTEXT, false )
#endif
@@ -970,9 +970,12 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.i_scenecut_threshold = val.i_int;
#endif
-#if X264_BUILD >= 55 /* r607 */
+#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */
var_Get( p_enc, SOUT_CFG_PREFIX "pre-scenecut", &val );
p_sys->param.b_pre_scenecut = val.b_bool;
+#endif
+
+#if X264_BUILD >= 55 /* r607 */
var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val );
p_sys->param.b_deterministic = val.b_bool;
#endif
|
