diff options
| author | wm4 <wm4@nowhere> | 2017-06-08 21:16:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-08 21:51:25 +0200 |
| commit | 0754cbc83eb030ed3c0f0666e8b7c2481631e513 (patch) | |
| tree | b4df7e128e0e65704ae62e5a19a73651def4f284 /video/fmt-conversion.c | |
| parent | 79dc1834f5932b36b0a2b48388654d2c4dcd2817 (diff) | |
| download | mpv-0754cbc83eb030ed3c0f0666e8b7c2481631e513.tar.bz2 mpv-0754cbc83eb030ed3c0f0666e8b7c2481631e513.tar.xz | |
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.)
Diffstat (limited to 'video/fmt-conversion.c')
| -rw-r--r-- | video/fmt-conversion.c | 5 |
1 files changed, 5 insertions, 0 deletions
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,8 +97,13 @@ 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 {IMGFMT_CUDA, AV_PIX_FMT_CUDA}, |