Skip to content

V
vlc
Commit 34e429ee authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

PS mux implements MPEG1 as "mpeg1", not "mpeg" - fixes #2380 

(cherry picked from commit dfbb9b5e)
parent b34d09f9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/gui/qt4/dialogs/sout.cpp
View file @ 34e429ee
...@@ -439,7 +439,7 @@ void SoutDialog::updateMRL() ...@@ -439,7 +439,7 @@ void SoutDialog::updateMRL()
#define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt ); #define SMUX( x, txt ) if( ui.x->isChecked() ) sout.psz_mux = strdup( txt );
SMUX( PSMux, "ps" ); SMUX( PSMux, "ps" );
SMUX( TSMux, "ts" ); SMUX( TSMux, "ts" );
SMUX( MPEG1Mux, "mpeg" ); SMUX( MPEG1Mux, "mpeg1" );
SMUX( OggMux, "ogg" ); SMUX( OggMux, "ogg" );
SMUX( ASFMux, "asf" ); SMUX( ASFMux, "asf" );
SMUX( MP4Mux, "mp4" ); SMUX( MP4Mux, "mp4" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment