[vlc-devel] commit: Fixed forcing a demux while using access_demux for rtp. ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Sep 25 19:51:15 2008 +0200| [b4951bceb2c47d47b7c2daadb83edb620d9bca27] | committer: Laurent Aimar 

Fixed forcing a demux while using access_demux for rtp.

Patch provided by Marian Durkovic.

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

 modules/demux/rtp.c |    5 +----
 src/input/input.c   |    9 +++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c
index cf85a37..df802b2 100644
--- a/modules/demux/rtp.c
+++ b/modules/demux/rtp.c
@@ -609,10 +609,7 @@ static void mpv_decode (demux_t *demux, void *data, block_t *block)
  */
 static void *ts_init (demux_t *demux)
 {
-    char *ts_demux = var_CreateGetNonEmptyString (demux, "demux");
-    void *stream = stream_init (demux, ts_demux ? ts_demux : "ts");
-    free (ts_demux);
-    return stream;
+    return stream_init (demux, *demux->psz_demux ? demux->psz_demux : "ts");
 }
 
 
diff --git a/src/input/input.c b/src/input/input.c
index 1d83299..9083d0f 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2200,12 +2200,9 @@ static int InputSourceInit( input_thread_t *p_input,
             }
         }
 
-        /* Try access_demux if no demux given */
-        if( *psz_demux == '\0' )
-        {
-            in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
-                                      NULL, p_input->p->p_es_out, false );
-        }
+        /* Try access_demux first */
+        in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
+                                  NULL, p_input->p->p_es_out, false );
     }
     else
     {