X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fdemux2.c;h=77385ddf14a27e878fc9c8617faf4434e678b239;hb=b3900df74868367ab342e06b6f1c1972c3261088;hp=0d23e02c106c5cab0d00e8765d335305bc8f32f2;hpb=07bc2fbdf36242cdbe4275db0ad01641b2cc8839;p=vlc

diff --git a/modules/demux/demux2.c b/modules/demux/demux2.c
index 0d23e02c10..77385ddf14 100644
--- a/modules/demux/demux2.c
+++ b/modules/demux/demux2.c
@@ -39,14 +39,14 @@ static void Demux2Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("Demux2 adaptation layer" ) );
-    set_capability( "demux", 2 );
+    set_capability( "demux", 10 );
     set_callbacks( Demux2Open, Demux2Close );
     add_shortcut( "demux2" );
 
     /* Hack */
     add_shortcut( "nsv" );
     add_shortcut( "live" );
-    add_shortcut( "ts2" );
+    add_shortcut( "ts" );
     add_shortcut( "ps2" );
     add_shortcut( "dvdnav" );
     add_shortcut( "dvdnavsimple" );
@@ -60,6 +60,16 @@ vlc_module_begin();
     add_shortcut( "flac" );
     add_shortcut( "m3u" );
     add_shortcut( "playlist" );
+    add_shortcut( "m4v" );
+    add_shortcut( "mp4v" );
+    add_shortcut( "mpgv" );
+    add_shortcut( "rawdv" );
+    add_shortcut( "ogg" );
+    add_shortcut( "h264" );
+    add_shortcut( "avi" );
+    add_shortcut( "mjpeg" );
+    add_shortcut( "directory" );
+    add_shortcut( "wav" );
 vlc_module_end();
 
 /*****************************************************************************
@@ -101,7 +111,7 @@ static int Demux2Open( vlc_object_t * p_this )
     }
     else
     {
-        sprintf( psz_uri, "%s", p_input->psz_name );
+        sprintf( psz_uri, "://%s", p_input->psz_name );
     }
 
     p_demux = demux2_New( p_input, psz_uri, p_input->s, p_input->p_es_out );