Commit 16b9d39f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: update avcodec-hw prefs

parent 900ada65
...@@ -471,11 +471,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -471,11 +471,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.live555TransportHTTPRadio->hide(); ui.live555TransportHTTPRadio->hide();
ui.live555TransportLabel->hide(); ui.live555TransportLabel->hide();
} }
CONFIG_BOOL( "avcodec-hw", hwAccelBox ); CONFIG_GENERIC( "avcodec-hw", StringList, ui.hwAccelLabel, hwAccelModule );
#ifdef WIN32 #ifdef WIN32
HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") ); HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") );
if( !hdxva2_dll ) if( !hdxva2_dll )
ui.hwAccelBox->setEnabled( false ); ui.hwAccelModule->setEnabled( false );
else else
FreeLibrary( hdxva2_dll ); FreeLibrary( hdxva2_dll );
#endif #endif
......
...@@ -69,10 +69,17 @@ ...@@ -69,10 +69,17 @@
<item row="11" column="3"> <item row="11" column="3">
<widget class="QComboBox" name="tuneBox"/> <widget class="QComboBox" name="tuneBox"/>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="1" colspan="2">
<widget class="QCheckBox" name="hwAccelBox"> <widget class="QComboBox" name="hwAccelModule">
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="hwAccelLabel">
<property name="text"> <property name="text">
<string>Use GPU accelerated decoding</string> <string>Hardware decoding acceleration</string>
</property>
<property name="buddy">
<cstring>hwAccelModule</cstring>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -345,7 +352,7 @@ ...@@ -345,7 +352,7 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>hwAccelBox</tabstop> <tabstop>hwAccelModule</tabstop>
<tabstop>PostProcLevel</tabstop> <tabstop>PostProcLevel</tabstop>
<tabstop>loopFilterBox</tabstop> <tabstop>loopFilterBox</tabstop>
<tabstop>presetBox</tabstop> <tabstop>presetBox</tabstop>
......
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