From 1d7a69b16a439a578afcf0dba40e26a8477b7af0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 28 May 2009 23:53:53 +0800 Subject: [PATCH] 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 --- modules/gui/qt4/components/sout/profile_selector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp index 7c47163f4e..3ebaa661f2 100644 --- a/modules/gui/qt4/components/sout/profile_selector.cpp +++ b/modules/gui/qt4/components/sout/profile_selector.cpp @@ -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" ){} #undef CHECKMUX 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() ) -- 2.39.2