[vlc-devel] commit: dvb: set demux=ts only if we didn't do scan (Ilkka Ollakka )

[git version control]

vlc | branch: 1.0-bugfix | Ilkka Ollakka <ileoo at iki.fi> | Fri Oct 30 17:44:35 2009 +0200| [d0290dfa33b718ce427ff7d3e4f01578b6f56048] | committer: Ilkka Ollakka 

dvb: set demux=ts only if we didn't do scan

Without this when scanning, we would force demuxer to ts but outputted m3u-playlist.
(cherry picked from commit a45e7b566f754925d10a0d2a84bccf97c5c5957a)

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

 modules/access/dvb/access.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 745da6e..37a00d7 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -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;
 }