[vlc-commits] demux: remove duplicated "demux" variable usage

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 26 18:09:24 2015 +0300| [d314a0b66e5cdf8c6c6ee278f13918859879c942] | committer: Rémi Denis-Courmont

demux: remove duplicated "demux" variable usage

The input thread already takes care of this once for both access_demux
and demux.

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

 src/input/demux.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index 2005b4f..e27a55c 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -52,13 +52,7 @@ demux_t *demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
 
     p_demux->p_input = p_parent_input;
     p_demux->psz_access = strdup( psz_access );
-
-    if( psz_demux[0] == '\0' )
-        /* Take into account "demux" to be able to do :demux=dump */
-        p_demux->psz_demux = var_InheritString( p_obj, "demux" );
-    else
-        p_demux->psz_demux = strdup( psz_demux );
-
+    p_demux->psz_demux = strdup( psz_demux );
     p_demux->psz_location = strdup( psz_location );
     p_demux->psz_file = get_path( psz_location ); /* parse URL */