[vlc-commits] input: provide module name in psz_demux for access_demux

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec  2 22:54:45 2017 +0200| [ce92396356f2134926df05d44eb7219ac7cc9e19] | committer: Rémi Denis-Courmont

input: provide module name in psz_demux for access_demux

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

 modules/access/rtp/rtp.c    | 8 ++++----
 modules/access/screen/xcb.c | 4 ++--
 src/input/input.c           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 8918ee92b8..1c4bced1a9 100644
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -162,16 +162,16 @@ static int Open (vlc_object_t *obj)
     demux_t *demux = (demux_t *)obj;
     int tp; /* transport protocol */
 
-    if (!strcmp (demux->psz_access, "dccp"))
+    if (!strcasecmp(demux->psz_demux, "dccp"))
         tp = IPPROTO_DCCP;
     else
-    if (!strcmp (demux->psz_access, "rtptcp"))
+    if (!strcasecmp(demux->psz_demux, "rtptcp"))
         tp = IPPROTO_TCP;
     else
-    if (!strcmp (demux->psz_access, "rtp"))
+    if (!strcasecmp(demux->psz_demux, "rtp"))
         tp = IPPROTO_UDP;
     else
-    if (!strcmp (demux->psz_access, "udplite"))
+    if (!strcasecmp(demux->psz_demux, "udplite"))
         tp = IPPROTO_UDPLITE;
     else
         return VLC_EGENERIC;
diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index 7531faf0ff..060d2c61c2 100644
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -161,7 +161,7 @@ static int Open (vlc_object_t *obj)
     p_sys->conn = conn;
 
    /* Find configured screen */
-    if (!strcmp (demux->psz_access, "screen"))
+    if (!strcasecmp(demux->psz_demux, "screen"))
     {
         const xcb_setup_t *setup = xcb_get_setup (conn);
         const xcb_screen_t *scr = NULL;
@@ -184,7 +184,7 @@ static int Open (vlc_object_t *obj)
     }
     else
     /* Determine capture window */
-    if (!strcmp (demux->psz_access, "window"))
+    if (!strcasecmp(demux->psz_demux, "window"))
     {
         char *end;
         unsigned long ul = strtoul (demux->psz_location, &end, 0);
diff --git a/src/input/input.c b/src/input/input.c
index b80f8867d7..f751b41299 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2494,7 +2494,7 @@ static demux_t *InputDemuxNew( input_thread_t *p_input, input_source_t *p_source
 
     /* first, try to create an access demux */
     p_demux = demux_NewAdvanced( VLC_OBJECT( p_source ), p_input,
-                                 psz_access, psz_demux, psz_path,
+                                 psz_access, psz_access, psz_path,
                                  NULL, priv->p_es_out, priv->b_preparsing );
     if( p_demux )
     {