Qt4 - Mkv muxer in GUI... Same as previous from thresh...

modules/gui/qt4/dialogs/sout.cpp

@@ -312,6 +312,7 @@ void SoutDialog::updateMRL()
     SMUX( WAVMux, "wav" );
     SMUX( RAWMux, "raw" );
     SMUX( FLVMux, "flv" );
+    SMUX( MKVMux, "mkv" );
 
     bool trans = false;
     bool more = false;

modules/gui/qt4/ui/sout.ui

@@ -441,7 +441,10 @@
    </item>
    <item row="3" column="0" colspan="2" >
     <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="tab" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="muxer" >
       <attribute name="title" >
        <string>_("Encapsulation")</string>
       </attribute>
@@ -516,6 +519,13 @@
          </property>
         </widget>
        </item>
+       <item row="1" column="3" >
+        <widget class="QRadioButton" name="MKVMux" >
+         <property name="text" >
+          <string>MKV</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2" >
@@ -735,6 +745,13 @@
      </widget>
     </widget>
    </item>
+   <item row="4" column="0" colspan="2" >
+    <widget class="Line" name="line_2" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_3" >
      <property name="title" >
@@ -851,13 +868,6 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="Line" name="line_2" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>