From dd408e68ed57fa5130bef976751e58a5d6e42f75 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 30 Jun 2017 12:27:15 +0200
Subject: d3d: make DXVA2 support optional

This partially reverts the change from a longer time ago to always build
DXVA2 and D3D11VA together.

To make it simpler, we change the following:
- building with ANGLE headers is now required to build D3D hwaccels
- if DXVA2 is enabled, D3D11VA is still forcibly built
- the CLI vo_opengl ANGLE backend is now under --egl-angle-win32

This is done to reduce the dependency mess slightly.
---
 video/decode/vd_lavc.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'video/decode/vd_lavc.c')

diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 226fd30bd3..a36adbf334 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -265,8 +265,11 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
 #endif
 #if HAVE_D3D_HWACCEL
     &mp_vd_lavc_d3d11va,
+
+ #if HAVE_D3D9_HWACCEL
     &mp_vd_lavc_dxva2,
     &mp_vd_lavc_dxva2_copy,
+ #endif
     &mp_vd_lavc_d3d11va_copy,
 #endif
 #if HAVE_ANDROID
-- 
cgit v1.2.3