* ts.c : renamed to ts.

 * mpeg/ts.c: lowered it's priority below demux2, and renamed it ts_old(_dvbpsi).

diff --git a/modules/demux/demux2.c b/modules/demux/demux2.c
index 1fa4aa6113f43b0903d40e5410dcd77525f2ff93..7be7f007e20710cad7ee61fde1d9bbfb75e454c7 100644 (file)
--- 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" );

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 2929ee46f982abaa6e470f53f374201dce04d089..5e669d2c4a43fa0b00c89e5adb27d7e2f77201dc 100644 (file)
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -131,12 +131,12 @@ static void TS_DVBPSI_HandlePMT ( input_thread_t *, dvbpsi_pmt_t * );
 vlc_module_begin();
 #if defined MODULE_NAME_IS_ts
     set_description( _("ISO 13818-1 MPEG Transport Stream input") );
-    set_capability( "demux", 160 );
-    add_shortcut( "ts" );
+    set_capability( "demux", 6 );
+    add_shortcut( "ts_old" );
 #elif defined MODULE_NAME_IS_ts_dvbpsi
     set_description( _("ISO 13818-1 MPEG Transport Stream input (libdvbpsi)") );
-    set_capability( "demux", 170 );
-    add_shortcut( "ts_dvbpsi" );
+    set_capability( "demux", 5 );
+    add_shortcut( "ts_old_dvbpsi" );
 #endif
 
     add_bool( "vls-backwards-compat", 0, NULL,

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 0bdcf9951ef10c60e1f0f7daa4caed0da498dfa6..e0a96f3387d8714f7e202009e72fbd1a8b1bd1d7 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -73,7 +73,7 @@ vlc_module_begin();
     add_bool( "ts-silent", 0, NULL, "Silent mode", "do not complain on encrypted PES", VLC_TRUE );
     set_capability( "demux2", 10 );
     set_callbacks( Open, Close );
-    add_shortcut( "ts2" );
+    add_shortcut( "ts" );
 vlc_module_end();
 
 /*****************************************************************************