* demux: another way to break your config file, or, --demux is now taken

into acount. (to make bigben happy, being able to do :demux=dump ;)

diff --git a/src/input/demux.c b/src/input/demux.c
index b90f83221bc07c979545f314bb171315e3577379..b8fb032201e5cd70d4dbd2d388fe2a852b793d2b 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -48,6 +48,13 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
     p_demux->psz_demux  = strdup( psz_demux );
     p_demux->psz_path   = strdup( psz_path );
 
+    /* Take into account "demux" to be able to do :demux=demuxdump */
+    if( *p_demux->psz_demux == '\0' )
+    {
+        free( p_demux->psz_demux );
+        p_demux->psz_demux = var_GetString( p_obj, "demux" );
+    }
+
     msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'",
              p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path );