Commit f5cbe602 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

x264: handle obsolete parameters (fix #2667)

parent d83ebc7e
...@@ -439,7 +439,7 @@ vlc_module_begin () ...@@ -439,7 +439,7 @@ vlc_module_begin ()
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 )
# else # else
add_obsolete_bool( "pre-scenecut" ) add_obsolete_bool( SOUT_CFG_PREFIX "pre-scenecut" )
# endif # endif
#endif #endif
...@@ -610,9 +610,13 @@ vlc_module_begin () ...@@ -610,9 +610,13 @@ vlc_module_begin ()
change_integer_range( 1, SUBME_MAX ) change_integer_range( 1, SUBME_MAX )
add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ) /* Deprecated since 0.8.5 */ add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ) /* Deprecated since 0.8.5 */
#if X264_BUILD >= 41 && X264_BUILD < 65 /* r368 */ #if X264_BUILD >= 41
# if X264_BUILD < 65 /* r368 */
add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT, add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT,
B_RDO_LONGTEXT, false ) B_RDO_LONGTEXT, false )
# else
add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" )
# endif
#endif #endif
#if X264_BUILD >= 36 /* r318 */ #if X264_BUILD >= 36 /* r318 */
...@@ -625,9 +629,13 @@ vlc_module_begin () ...@@ -625,9 +629,13 @@ vlc_module_begin ()
CHROMA_ME_LONGTEXT, false ) CHROMA_ME_LONGTEXT, false )
#endif #endif
#if X264_BUILD >= 43 && X264_BUILD < 65 /* r390 */ #if X264_BUILD >= 43
# if X264_BUILD < 65 /* r390 */
add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT, add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT,
BIME_LONGTEXT, false ) BIME_LONGTEXT, false )
# else
add_obsolete_bool( SOUT_CFG_PREFIX "bime" )
# endif
#endif #endif
#if X264_BUILD >= 30 /* r251 */ #if X264_BUILD >= 30 /* r251 */
......
...@@ -90,7 +90,7 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[]) ...@@ -90,7 +90,7 @@ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
fputs ("LibVLC has detected an unusable buggy GNU/libc version.\n" fputs ("LibVLC has detected an unusable buggy GNU/libc version.\n"
"Please update to version 2.8 or newer.\n", stderr); "Please update to version 2.8 or newer.\n", stderr);
fflush (stderr); fflush (stderr);
abort (); //abort ();
} }
#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