Commit 8a260c78 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

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

parent 9d0cb667
...@@ -312,6 +312,7 @@ void SoutDialog::updateMRL() ...@@ -312,6 +312,7 @@ void SoutDialog::updateMRL()
SMUX( WAVMux, "wav" ); SMUX( WAVMux, "wav" );
SMUX( RAWMux, "raw" ); SMUX( RAWMux, "raw" );
SMUX( FLVMux, "flv" ); SMUX( FLVMux, "flv" );
SMUX( MKVMux, "mkv" );
bool trans = false; bool trans = false;
bool more = false; bool more = false;
......
...@@ -441,7 +441,10 @@ ...@@ -441,7 +441,10 @@
</item> </item>
<item row="3" column="0" colspan="2" > <item row="3" column="0" colspan="2" >
<widget class="QTabWidget" name="tabWidget" > <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" > <attribute name="title" >
<string>_("Encapsulation")</string> <string>_("Encapsulation")</string>
</attribute> </attribute>
...@@ -516,6 +519,13 @@ ...@@ -516,6 +519,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3" >
<widget class="QRadioButton" name="MKVMux" >
<property name="text" >
<string>MKV</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2" > <widget class="QWidget" name="tab_2" >
...@@ -735,6 +745,13 @@ ...@@ -735,6 +745,13 @@
</widget> </widget>
</widget> </widget>
</item> </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" > <item row="5" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_3" > <widget class="QGroupBox" name="groupBox_3" >
<property name="title" > <property name="title" >
...@@ -851,13 +868,6 @@ ...@@ -851,13 +868,6 @@
</item> </item>
</layout> </layout>
</item> </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> </layout>
</widget> </widget>
<resources/> <resources/>
......
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