Skip to content

V
vlc
Commit a5353254 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

x264: Correct commit 40deedec

parent 40deedec
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
modules/codec/x264.c
View file @ a5353254
...@@ -431,14 +431,11 @@ vlc_module_begin(); ...@@ -431,14 +431,11 @@ vlc_module_begin();
#if X264_BUILD >= 55 /* r607 */ #if X264_BUILD >= 55 /* r607 */
# if X264_BUILD < 67 /* r1117 */ # if 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,
<<<<<<< HEAD:modules/codec/x264.c
PRESCENE_LONGTEXT, false ); PRESCENE_LONGTEXT, false );
=======
PRESCENE_LONGTEXT, false ) PRESCENE_LONGTEXT, false )
# else # else
add_obsolete_bool( "pre-scenecut" ) add_obsolete_bool( "pre-scenecut" )
# endif # endif
>>>>>>> d46728d... x264: obsolete pre-scenecut option.:modules/codec/x264.c
#endif #endif
add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT,
......
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