]> git.sesse.net Git - vlc/commitdiff
dvb: set demux=ts only if we didn't do scan
authorIlkka Ollakka <ileoo@iki.fi>
Fri, 30 Oct 2009 15:44:35 +0000 (17:44 +0200)
committerIlkka Ollakka <ileoo@iki.fi>
Fri, 30 Oct 2009 15:45:37 +0000 (17:45 +0200)
Without this when scanning, we would force demuxer to ts but outputted m3u-playlist.

modules/access/dvb/access.c

index f88d27ff13fd3760a8f02687906093407aef2cb2..3c40234630298d4b97cabcf5a24d0238077b16fe 100644 (file)
@@ -421,8 +421,11 @@ static int Open( vlc_object_t *p_this )
     else
         p_sys->i_read_once = DVB_READ_ONCE_START;
 
-    free( p_access->psz_demux );
-    p_access->psz_demux = strdup( "ts" );
+    if( !p_sys->b_scan_mode )
+    {
+        free( p_access->psz_demux );
+        p_access->psz_demux = strdup( "ts" );
+    }
     return VLC_SUCCESS;
 }