From ae7db6503b6fc6fce78d20e8afc77a5a7a0f0b29 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 26 Sep 2017 18:12:19 +0200 Subject: video: drop old D3D11/DXVA2 support Now you need FFmpeg git, or something. This also gets rid of the last real use of gpu_memcpy(). libavutil does that itself. (vaapi.c still used it, but it was essentially unused, because the code path isn't really in use anymore. It wasn't even included due to the d3d-hwaccel dependency in wscript.) --- video/fmt-conversion.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'video/fmt-conversion.c') diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 6d14c28c7a..3b941d5fb7 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -64,12 +64,8 @@ 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