[vlc-commits] Remove prefer-system codecs option

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Apr 25 19:25:14 2011 +0200| [e5ef811fff71e7fe8a1552f5d190559a0ed465b7] | committer: Jean-Baptiste Kempf

Remove prefer-system codecs option

Close #3093

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e5ef811fff71e7fe8a1552f5d190559a0ed465b7
---

 src/libvlc-module.c |    8 +-------
 src/libvlc.c        |   19 -------------------
 2 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a347e6a..b5e2fca 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -963,11 +963,6 @@ static const char *const ppsz_clock_descriptions[] =
     "This allows you to select a list of encoders that VLC will use in " \
     "priority.")
 
-#define SYSTEM_CODEC_TEXT N_("Prefer system plugins over VLC")
-#define SYSTEM_CODEC_LONGTEXT N_( \
-    "Indicates whether VLC will prefer native plugins installed " \
-    "on system over VLC owns plugins whenever a choice is available." )
-
 /*****************************************************************************
  * Sout
  ****************************************************************************/
@@ -1978,8 +1973,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_VCODEC )
     set_subcategory( SUBCAT_INPUT_ACODEC )
     set_subcategory( SUBCAT_INPUT_SCODEC )
-    add_bool( "prefer-system-codecs", false, SYSTEM_CODEC_TEXT,
-                                SYSTEM_CODEC_LONGTEXT, false )
+    add_obsolete_bool( "prefer-system-codecs" )
 
     set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
     add_module_list_cat( "stream-filter", SUBCAT_INPUT_STREAM_FILTER, NULL, NULL,
diff --git a/src/libvlc.c b/src/libvlc.c
index 06ebd6b..dc3f48f 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -924,25 +924,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         intf_Create( p_libvlc, "netsync,none" );
     }
 
-#ifdef WIN32
-    if( var_InheritBool( p_libvlc, "prefer-system-codecs") )
-    {
-        char *psz_codecs = var_CreateGetNonEmptyString( p_libvlc, "codec" );
-        if( psz_codecs )
-        {
-            char *psz_morecodecs;
-            if( asprintf(&psz_morecodecs, "%s,dmo", psz_codecs) != -1 )
-            {
-                var_SetString( p_libvlc, "codec", psz_morecodecs);
-                free( psz_morecodecs );
-            }
-            free( psz_codecs );
-        }
-        else
-            var_SetString( p_libvlc, "codec", "dmo");
-    }
-#endif
-
 #ifdef __APPLE__
     var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );