x264: handle obsolete parameters (fix #2667)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index cfd7e8c2d4e40db194f32ab629ea8749159360cc..5004c2c724569bcfa1f70536a0d6afb5b86a9894 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -439,7 +439,7 @@ vlc_module_begin ()
     add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
               PRESCENE_LONGTEXT, false )
 #  else
-    add_obsolete_bool( "pre-scenecut" )
+    add_obsolete_bool( SOUT_CFG_PREFIX "pre-scenecut" )
 #  endif
 #endif
 
@@ -610,9 +610,13 @@ vlc_module_begin ()
         change_integer_range( 1, SUBME_MAX )
         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,
               B_RDO_LONGTEXT, false )
+# else
+    add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" )
+# endif
 #endif
 
 #if X264_BUILD >= 36 /* r318 */
@@ -625,9 +629,13 @@ vlc_module_begin ()
               CHROMA_ME_LONGTEXT, false )
 #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,
               BIME_LONGTEXT, false )
+# else
+    add_obsolete_bool( SOUT_CFG_PREFIX "bime" )
+# endif
 #endif
 
 #if X264_BUILD >= 30 /* r251 */

diff --git a/src/misc/linux_specific.c b/src/misc/linux_specific.c
index a9165c1b3171a2b6a3585f36e3b4a719b18a6e74..0bc2e09884881d600464e80e77c7652aadd51146 100644 (file)
--- a/src/misc/linux_specific.c
+++ b/src/misc/linux_specific.c
@@ -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"
                "Please update to version 2.8 or newer.\n", stderr);
         fflush (stderr);
-        abort ();
+        //abort ();
     }
 #endif