diff options
Diffstat (limited to 'video')
-rw-r--r-- | video/decode/vd_lavc.c | 6 | ||||
-rw-r--r-- | video/fmt-conversion.c | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec.c | 2 |
3 files changed, 3 insertions, 7 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 diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 0a64bae83b..1fca8bfacf 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -109,7 +109,7 @@ static const struct { #endif {IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD}, {IMGFMT_DXVA2, AV_PIX_FMT_DXVA2_VLD}, -#if HAVE_D3D11VA_HWACCEL +#if HAVE_D3D_HWACCEL {IMGFMT_D3D11VA, AV_PIX_FMT_D3D11VA_VLD}, #endif #if HAVE_AV_PIX_FMT_MMAL diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index fee4a16059..1f654fc1ec 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -46,7 +46,7 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { #if HAVE_VIDEOTOOLBOX_GL &gl_hwdec_videotoolbox, #endif -#if HAVE_DXVA2_HWACCEL +#if HAVE_D3D_HWACCEL #if HAVE_EGL_ANGLE &gl_hwdec_d3d11egl, &gl_hwdec_dxva2egl, |