From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 19 Sep 2010 22:28:45 +0000 (+0200)
Subject: Qt Sprefs: remove mpeg2 skip-frames
X-Git-Tag: 1.2.0-pre1~5248
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4ba419b6cbd377c668d6a221154df358b610ebcc;p=vlc

Qt Sprefs: remove mpeg2 skip-frames
---

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 62068b270f..8bc0a32ccd 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -458,7 +458,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             optionWidgets.append( ui.DVDDevice );
             optionWidgets.append( ui.cachingCombo );
             CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
-            CONFIG_BOOL( "skip-frames", skipFrames );
             CONFIG_GENERIC( "sout-x264-tune", StringList, ui.x264Label, tuneBox );
             CONFIG_GENERIC( "sout-x264-preset", StringList, ui.x264Label, presetBox );
             CONFIG_GENERIC( "sout-x264-profile", StringList, ui.x264profileLabel, profileBox );
diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index ea84ce042f..61dbfb467e 100644
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>737</width>
-    <height>594</height>
+    <height>567</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -63,7 +63,7 @@
       <item row="8" column="2">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
-      <item row="14" column="0">
+      <item row="13" column="0">
        <widget class="QLabel" name="x264Label">
         <property name="minimumSize">
          <size>
@@ -79,7 +79,7 @@
         </property>
        </widget>
       </item>
-      <item row="13" column="0">
+      <item row="12" column="0">
        <widget class="QLabel" name="x264profileLabel">
         <property name="minimumSize">
          <size>
@@ -95,7 +95,7 @@
         </property>
        </widget>
       </item>
-      <item row="13" column="1">
+      <item row="12" column="1">
        <widget class="QComboBox" name="presetBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -105,7 +105,7 @@
         </property>
        </widget>
       </item>
-      <item row="13" column="2">
+      <item row="12" column="2">
        <widget class="QComboBox" name="tuneBox"/>
       </item>
       <item row="2" column="0">
@@ -131,27 +131,17 @@
         </property>
        </widget>
       </item>
-      <item row="9" column="0" colspan="3">
-       <widget class="QCheckBox" name="skipFrames">
-        <property name="text">
-         <string>Skip frames</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="12" column="0" colspan="3">
+      <item row="11" column="0" colspan="3">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="14" column="2">
+      <item row="13" column="2">
        <widget class="QLineEdit" name="levelBox"/>
       </item>
-      <item row="14" column="1">
+      <item row="13" column="1">
        <widget class="QComboBox" name="profileBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -177,7 +167,7 @@
         </property>
        </widget>
       </item>
-      <item row="11" column="0" colspan="3">
+      <item row="10" column="0" colspan="3">
        <widget class="QCheckBox" name="systemCodecBox">
         <property name="text">
          <string>Use systems codecs if available, for WMV codecs</string>