[vlc-devel] commit: PS mux implements MPEG1 as "mpeg1", not "mpeg" - fixes #2380 ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Dec 30 16:24:04 CET 2008


vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Dec 30 17:16:02 2008 +0200| [34e429ee8b1c4c827a93724129381f5779d506b5] | committer: Rémi Denis-Courmont 

PS mux implements MPEG1 as "mpeg1", not "mpeg" - fixes #2380
(cherry picked from commit dfbb9b5e4a754f42e686153c0d82291efb01324a)

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

 modules/gui/qt4/dialogs/sout.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 2e0f270..5c1c46a 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -439,7 +439,7 @@ void SoutDialog::updateMRL()
 #define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
     SMUX( PSMux, "ps" );
     SMUX( TSMux, "ts" );
-    SMUX( MPEG1Mux, "mpeg" );
+    SMUX( MPEG1Mux, "mpeg1" );
     SMUX( OggMux, "ogg" );
     SMUX( ASFMux, "asf" );
     SMUX( MP4Mux, "mp4" );




More information about the vlc-devel mailing list