[vlc-commits] commit: Qt: do not allow activation of DxVA2 in SPrefs on XP ( Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Tue Sep 7 14:19:44 CEST 2010
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep 7 12:59:02 2010 +0200| [15978b3f2dec2fc28afbcc24c33d057afb44b0b4] | committer: Jean-Baptiste Kempf
Qt: do not allow activation of DxVA2 in SPrefs on XP
XP is too old. Deal with it. Will ease support
Close #3727
(cherry picked from commit 2f8eed3529a8e39b632fc2a2b5fb552529762692)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=15978b3f2dec2fc28afbcc24c33d057afb44b0b4
---
modules/gui/qt4/components/simple_preferences.cpp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 8b57778..ff1043c 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -446,12 +446,17 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
ui.live555TransportHTTPRadio->hide();
ui.live555TransportLabel->hide();
}
+ CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
#ifdef WIN32
CONFIG_BOOL( "prefer-system-codecs", systemCodecBox );
+ HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") );
+ if( !hdxva2_dll )
+ ui.hwAccelBox->setEnabled( false );
+ else
+ FreeLibrary( hdxva2_dll );
#else
ui.systemCodecBox->hide();
#endif
- CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
optionWidgets.append( ui.DVDDevice );
optionWidgets.append( ui.cachingCombo );
CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
More information about the vlc-commits
mailing list