From 0754cbc83eb030ed3c0f0666e8b7c2481631e513 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 8 Jun 2017 21:16:11 +0200
Subject: d3d: add support for new libavcodec hwaccel API

Unfortunately quite a mess, in particular due to the need to have some
compatibility with the old API. (The old API will be supported only in
short term.)
---
 video/fmt-conversion.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'video/fmt-conversion.c')

diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index 7a9e2088f8..21acfb5cc4 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -97,7 +97,12 @@ static const struct {
     {IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD},
     {IMGFMT_DXVA2, AV_PIX_FMT_DXVA2_VLD},
 #if HAVE_D3D_HWACCEL
+#if HAVE_D3D_HWACCEL_NEW
+    {IMGFMT_D3D11VA, AV_PIX_FMT_D3D11},
+    {IMGFMT_D3D11NV12, AV_PIX_FMT_D3D11},
+#else
     {IMGFMT_D3D11VA, AV_PIX_FMT_D3D11VA_VLD},
+#endif
 #endif
     {IMGFMT_MMAL, AV_PIX_FMT_MMAL},
 #if HAVE_CUDA_HWACCEL
-- 
cgit v1.2.3