Skip to content

V
vlc
Commit f69af253 authored by Jean-Philippe Andre's avatar Jean-Philippe Andre
Browse files
Options

Qt Sout dialog: MJPEG mux is "mpjpeg" 

Note that "avformat{mux=mjpeg}" is also valid.
parent 76084969
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/qt4/components/sout/profile_selector.cpp
View file @ f69af253
...@@ -331,7 +331,7 @@ void VLCProfileEditor::fillProfile( const QString& qs ) ...@@ -331,7 +331,7 @@ void VLCProfileEditor::fillProfile( const QString& qs )
CHECKMUX( FLVMux, "flv" ) CHECKMUX( FLVMux, "flv" )
CHECKMUX( MKVMux, "mkv" ) CHECKMUX( MKVMux, "mkv" )
CHECKMUX( AVIMux, "avi" ) CHECKMUX( AVIMux, "avi" )
CHECKMUX( MJPEGMux, "mjpg" ){} CHECKMUX( MJPEGMux, "mpjpeg" ){}
#undef CHECKMUX #undef CHECKMUX
ui.keepVideo->setChecked( !options[1].toInt() ); ui.keepVideo->setChecked( !options[1].toInt() );
...@@ -420,7 +420,7 @@ QString VLCProfileEditor::transcodeValue() ...@@ -420,7 +420,7 @@ QString VLCProfileEditor::transcodeValue()
SMUX( FLVMux, "flv" ) SMUX( FLVMux, "flv" )
SMUX( MKVMux, "mkv" ) SMUX( MKVMux, "mkv" )
SMUX( AVIMux, "avi" ) SMUX( AVIMux, "avi" )
SMUX( MJPEGMux, "mjpg" ){} SMUX( MJPEGMux, "mpjpeg" ){}
#undef SMUX #undef SMUX
#define currentData( box ) box->itemData( box->currentIndex() ) #define currentData( box ) box->itemData( box->currentIndex() )
......
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