Changeset 6bb37546483d236848dbe3dd11a601409e158e85

Timestamp:

26/04/07 17:51:03 (2 years ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1177602663 +0000

git-parent:

[770c80230588fe07a87afd7c40dc72dfdb8561d5]

git-author:

Damien Fouilleul <damienf@videolan.org> 1177602663 +0000

Message:

- configuration: added "--prefer-system-codecs" option to force VLC to use codecs installed on system whwn a choice is available (currently only works on win32)

Files:

• src/libvlc-common.c (modified) (1 diff)
• src/libvlc-module.c (modified) (2 diffs)

src/libvlc-common.c

@@ -906 +906 @@
-        VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
-    }
+
+#ifdef WIN32
+    if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 )
+    {
+        char *psz_codecs = config_GetPsz( p_playlist, "codec" );
+        if( psz_codecs )
+        {
+            char *psz_morecodecs;
+            asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs);
+            if( psz_morecodecs )
+                config_PutPsz( p_libvlc, "codec", psz_morecodecs);
+        }
+        else
+            config_PutPsz( p_libvlc, "codec", "dmo,quicktime");
+        free(psz_codecs);
+    }
+#endif
-
-    /*

src/libvlc-module.c

@@ -692 +692 @@
-    "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." )
-
-/*****************************************************************************
@@ -1405 +1410 @@
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_GENERAL );
+
+    add_bool( "prefer-system-codecs", VLC_FALSE, NULL, SYSTEM_CODEC_TEXT,
+                                SYSTEM_CODEC_LONGTEXT, VLC_FALSE );
-
-    add_bool( "france", VLC_FALSE, NULL, N_("France"), FRANCE_LONGTEXT, VLC_TRUE );