Changeset 47d4e675cc4eeeb24e02b97ef8cbe8baf39fc3ca

Timestamp:

07/10/05 00:09:24 (3 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1128636564 +0000

git-parent:

[d4c07f8d566f766845c01ec7dd51032b4267ab7e]

git-author:

Laurent Aimar <fenrir@videolan.org> 1128636564 +0000

Message:

• input: :demux=module really force module and bypass demuxer module given
  

by access.

• udp: force ts demux on payload 33 (:demux=dump will work)
  

Files:

• modules/access/udp.c (modified) (1 diff)
• src/input/input.c (modified) (2 diffs)

modules/access/udp.c

@@ -457 +457 @@
-        case 33:
-            msg_Dbg( p_access, "detected TS over RTP" );
-
-
+
-            break;
-

src/input/input.c

@@ -1925 +1925 @@
-
-    if( !in ) return VLC_EGENERIC;
-
+
-    /* Split uri */
-    if( !b_quick )
@@ -1945 +1945 @@
-
-        if( psz_forced_demux && *psz_forced_demux )
+        {
+            if( psz_demux ) free( psz_demux );
-            psz_demux = psz_forced_demux;
+        }
+        else if( !psz_demux || *psz_demux == '\0' )
+        {
+            /* special hack for forcing a demuxer with --demux=module
+             * (and do nothing with a list) */
+            char *psz_var_demux = var_GetString( p_input, "demux" );
+
+            if( *psz_var_demux != '\0' &&
+                !strchr(psz_var_demux, ',' ) &&
+                !strchr(psz_var_demux, ':' ) )
+            {
+                psz_demux = psz_var_demux;
+
+                msg_Dbg( p_input, "Enforce demux ` %s'", psz_demux );
+            }
+            else if( psz_var_demux )
+            {
+                free( psz_var_demux );
+            }
+        }
-
-        /* Try access_demux if no demux given */