Switch the few var_GetString remains to var_GetNonEmptyString

[vlc] / src / input / demux.c

diff --git a/src/input/demux.c b/src/input/demux.c
index b6857dc432e04eafe898be9c152e544045d4d8f4..712bfd2276ef87173b2c08acfd0da14ad32be87c 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -50,7 +50,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
     if( *p_demux->psz_demux == '\0' )
     {
         free( p_demux->psz_demux );
-        p_demux->psz_demux = var_GetString( p_obj, "demux" );
+        p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" );
+        if( p_demux->psz_demux == NULL )
+            p_demux->psz_demux = strdup( "" );
     }
 
     if( !b_quick )