Qt: add the hw-accel to simple preferences

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index cbf3e77c62a399bb2fe1a0b57182c989da2cb121..435529b14991a2abf8dfabaa94b66d1c23597847 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -429,8 +429,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
 #else
             ui.systemCodecBox->hide();
-            ui.systemCodecLabel->hide();
 #endif
+            CONFIG_GENERIC( "ffmpeg-hw", Bool, NULL, hwAccelBox );
             optionWidgets.append( ui.DVDDevice );
             optionWidgets.append( ui.cachingCombo );
             CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 2564df314c09c0752f69ef2de2a1710d8941433d..5b554133b95cd7aa281035a3c582f6f05eea01a8 100644 (file)
--- 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>687</width>
-    <height>489</height>
+    <height>548</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -227,22 +227,6 @@
       <string>Codecs</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="0">
-       <widget class="QLabel" name="ppLabel">
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Video quality post-processing level</string>
-        </property>
-        <property name="buddy">
-         <cstring>PostProcLevel</cstring>
-        </property>
-       </widget>
-      </item>
       <item row="7" column="0">
        <widget class="QLabel" name="filterLabel">
         <property name="text">
@@ -289,17 +273,33 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="systemCodecLabel">
+      <item row="2" column="0">
+       <widget class="QLabel" name="ppLabel">
+        <property name="minimumSize">
+         <size>
+          <width>250</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
-         <string>System codecs (better quality)</string>
+         <string>Video quality post-processing level</string>
+        </property>
+        <property name="buddy">
+         <cstring>PostProcLevel</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="hwAccelBox">
+        <property name="text">
+         <string>Use GPU acceleration (experimental)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="systemCodecBox">
         <property name="text">
-         <string>Use host codecs if available</string>
+         <string>Use system codecs if available (better quality, but dangerous)</string>
         </property>
        </widget>
       </item>
@@ -317,7 +317,6 @@
   <tabstop>PostProcLevel</tabstop>
   <tabstop>AviRepair</tabstop>
   <tabstop>live555TransportRTSP_TCPRadio</tabstop>
-  <tabstop>systemCodecBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>