From: Jean-Philippe Andre <jpeg@via.ecp.fr>
Date: Thu, 28 May 2009 15:53:53 +0000 (+0800)
Subject: Qt Sout dialog: MJPEG mux is "mpjpeg"
X-Git-Tag: 1.1.0-ff~5695
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1d7a69b16a439a578afcf0dba40e26a8477b7af0;p=vlc

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 <jb@videolan.org>
---

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() )