[vlc-commits] DTV: always override the demux (refs #11185)

Rémi Denis-Courmont git at videolan.org
Sat Apr 12 21:10:00 CEST 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Apr 12 21:59:56 2014 +0300| [1516cebddbc418502da2c95b9d6b72e418f0eb8c] | committer: Rémi Denis-Courmont

DTV: always override the demux (refs #11185)

...like other access plugins already do. The input thread does not care
if the original psz_demux value is overriden.

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

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

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 086c3fb..95b1dd7 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -479,11 +479,8 @@ static int Open (vlc_object_t *obj)
 
     access->pf_block = Read;
     access->pf_control = Control;
-    if (access->psz_demux == NULL || !access->psz_demux[0])
-    {
-        free (access->psz_demux);
-        access->psz_demux = strdup ("ts");
-    }
+    free (access->psz_demux);
+    access->psz_demux = strdup ("ts");
     return VLC_SUCCESS;
 
 error:



More information about the vlc-commits mailing list