summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-11 14:37:03 +0200
committerwm4 <wm4@nowhere>2016-05-11 15:40:31 +0200
commitfd82e14888ae2fb1a7430e1166a048dc03321d49 (patch)
tree28ffc9b123bf4dbeb8218181d74d4963836fb0d5 /video/decode
parentfde20d10bcacebf61aff42ab1f48ac72023a2aa5 (diff)
downloadmpv-fd82e14888ae2fb1a7430e1166a048dc03321d49.tar.bz2
mpv-fd82e14888ae2fb1a7430e1166a048dc03321d49.tar.xz
build: merge d3d11va and dxva2 hwaccel checks
We don't have any reason to disable either. Both are loaded dynamically at runtime anyway. There is also no reason why dxva2 would disappear from libavcodec any time soon.
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/vd_lavc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index bc70b7d348..75ca1f0229 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -154,14 +154,10 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
&mp_vd_lavc_vaapi,
&mp_vd_lavc_vaapi_copy,
#endif
-#if HAVE_D3D11VA_HWACCEL
+#if HAVE_D3D_HWACCEL
&mp_vd_lavc_d3d11va,
-#endif
-#if HAVE_DXVA2_HWACCEL
&mp_vd_lavc_dxva2,
&mp_vd_lavc_dxva2_copy,
-#endif
-#if HAVE_D3D11VA_HWACCEL
&mp_vd_lavc_d3d11va_copy,
#endif
#if HAVE_ANDROID