Commit 1d7a69b1 authored by Jean-Philippe Andre's avatar Jean-Philippe Andre Committed by Jean-Baptiste Kempf
Browse files

Qt Sout dialog: MJPEG mux is "mpjpeg"

Note that "avformat{mux=mjpeg}" is also valid.
(cherry picked from commit f69af253a4fe0dbf4121c4a320d01adb1c6d0cab)
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <>
parent 773c5ee4
......@@ -331,7 +331,7 @@ void VLCProfileEditor::fillProfile( const QString& qs )
CHECKMUX( FLVMux, "flv" )
CHECKMUX( MKVMux, "mkv" )
CHECKMUX( AVIMux, "avi" )
CHECKMUX( MJPEGMux, "mjpg" ){}
CHECKMUX( MJPEGMux, "mpjpeg" ){}
ui.keepVideo->setChecked( !options[1].toInt() );
......@@ -420,7 +420,7 @@ QString VLCProfileEditor::transcodeValue()
SMUX( FLVMux, "flv" )
SMUX( MKVMux, "mkv" )
SMUX( AVIMux, "avi" )
SMUX( MJPEGMux, "mjpg" ){}
SMUX( MJPEGMux, "mpjpeg" ){}
#undef SMUX
#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