Commit 3fbd1657 authored by Sabourin Gilles's avatar Sabourin Gilles Committed by Derk-Jan Hartman

x264 Removed pre-scenecut definitions for build 67

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 8f601a32)
Signed-off-by: default avatarDerk-Jan Hartman <hartman@videolan.org>
parent 186cefbb
...@@ -75,7 +75,7 @@ static void Close( vlc_object_t * ); ...@@ -75,7 +75,7 @@ static void Close( vlc_object_t * );
"I-frames are inserted only every other keyint frames, which probably " \ "I-frames are inserted only every other keyint frames, which probably " \
"leads to ugly encoding artifacts. Range 1 to 100." ) "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_TEXT N_("Faster, less precise scenecut detection" )
#define PRESCENE_LONGTEXT N_( "Faster, less precise scenecut detection. " \ #define PRESCENE_LONGTEXT N_( "Faster, less precise scenecut detection. " \
"Required and implied by multi-threading." ) "Required and implied by multi-threading." )
...@@ -428,7 +428,7 @@ vlc_module_begin(); ...@@ -428,7 +428,7 @@ vlc_module_begin();
SCENE_LONGTEXT, false ); SCENE_LONGTEXT, false );
change_integer_range( -1, 100 ); 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, add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
PRESCENE_LONGTEXT, false ); PRESCENE_LONGTEXT, false );
#endif #endif
...@@ -957,9 +957,12 @@ static int Open ( vlc_object_t *p_this ) ...@@ -957,9 +957,12 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.i_scenecut_threshold = val.i_int; p_sys->param.i_scenecut_threshold = val.i_int;
#endif #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 ); var_Get( p_enc, SOUT_CFG_PREFIX "pre-scenecut", &val );
p_sys->param.b_pre_scenecut = val.b_bool; 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 ); var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val );
p_sys->param.b_deterministic = val.b_bool; p_sys->param.b_deterministic = val.b_bool;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment