[vlc-commits] Qt: fix sout mux module names

Rémi Denis-Courmont git at videolan.org
Wed Apr 8 18:18:28 CEST 2015


vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Apr  1 11:41:02 2015 +0300| [3615cd1b98c010672f62d8d39c1e836e1bb2c89e] | committer: Jean-Baptiste Kempf

Qt: fix sout mux module names

(cherry picked from commit 2c785718280fd69bdfe4c033c454a0834630bf19)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/components/sout/profile_selector.cpp |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp
index 7299823..858a8ec 100644
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@ -508,19 +508,19 @@ inline void VLCProfileEditor::registerCodecs()
     ui.button->setProperty( "capstream", stream );\
     ui.button->setProperty( "capchaps", chaps );\
     CONNECT( ui.button, clicked(bool), this, muxSelected() );
-    SETMUX( PSMux, "ps", "ps",      true, true, false, true, false, true )
+    SETMUX( PSMux, "ps", "mux_ps",  true, true, false, true, false, true )
     SETMUX( TSMux, "ts", "mux_ts",  true, true, false, true, true, false )
     SETMUX( WEBMux, "webm", "avformat", true, true, false, false, true, false )
-    SETMUX( MPEG1Mux, "mpeg1", "ps", true, true, false, false, false, false )
-    SETMUX( OggMux, "ogg", "mux_ogg",true, true, false, false, true, true )
-    SETMUX( ASFMux, "asf", "asf",   true, true, false, true, true, true )
-    SETMUX( MOVMux, "mp4", "mp4",   true, true, true, true, true, false )
-    SETMUX( WAVMux, "wav", "wav",   false, true, false, false, false, false )
-    SETMUX( RAWMux, "raw", "dummy", true, true, false, false, false, false )
+    SETMUX( MPEG1Mux, "mpeg1", "mux_ps", true, true, false, false, false, false )
+    SETMUX( OggMux, "ogg", "mux_ogg", true, true, false, false, true, true )
+    SETMUX( ASFMux, "asf", "mux_asf", true, true, false, true, true, true )
+    SETMUX( MOVMux, "mp4", "mux_mp4", true, true, true, true, true, false )
+    SETMUX( WAVMux, "wav", "mux_wav", false, true, false, false, false, false )
+    SETMUX( RAWMux, "raw", "mux_dummy", true, true, false, false, false, false )
     SETMUX( FLVMux, "flv", "avformat", true, true, false, false, true, false )
     SETMUX( MKVMux, "mkv", "avformat", true, true, true, true, true, true )
-    SETMUX( AVIMux, "avi", "avi",   true, true, false, false, false, false )
-    SETMUX( MJPEGMux, "mpjpeg", "mpjpeg", true, false, false, false, false, false )
+    SETMUX( AVIMux, "avi", "mux_avi", true, true, false, false, false, false )
+    SETMUX( MJPEGMux, "mpjpeg", "mux_mpjpeg", true, false, false, false, false, false )
 #undef SETMUX
 
 #define ADD_VCODEC( name, fourcc ) \



More information about the vlc-commits mailing list