diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-08-01 09:16:42 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-08-01 10:38:18 +0200 |
| commit | 6aac17cebbcec645a9c07043b78d57a9b04f2578 (patch) | |
| tree | 0f5d78f2e7e157e3a2320ce23b4df1e63fcce7ac /video/fmt-conversion.c | |
| parent | 33137606e9fba8677f1cb1f5424aff2067075147 (diff) | |
| download | mpv-6aac17cebbcec645a9c07043b78d57a9b04f2578.tar.bz2 mpv-6aac17cebbcec645a9c07043b78d57a9b04f2578.tar.xz | |
vda: only support the new hwaccel 1.2 API (remove old code)
Since the new hwaccel API is now merged in ffmpeg's stable release, we can
finally remove support for the old API.
I pretty much kept lu_zero's new code unchanged and just added some error
printing (that we had with the old glue code) to make the life of our users
less miserable.
Diffstat (limited to 'video/fmt-conversion.c')
| -rw-r--r-- | video/fmt-conversion.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 44fafa631f..a8ae905813 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -172,13 +172,11 @@ static const struct { {IMGFMT_BGR0, AV_PIX_FMT_BGRA}, #endif - {IMGFMT_VDPAU, AV_PIX_FMT_VDPAU}, -#if HAVE_VDA_AV_VDA_ALLOC_CONTEXT - {IMGFMT_VDA, AV_PIX_FMT_VDA}, -#else - {IMGFMT_VDA, AV_PIX_FMT_VDA_VLD}, + {IMGFMT_VDPAU, AV_PIX_FMT_VDPAU}, +#if HAVE_VDA_HWACCEL + {IMGFMT_VDA, AV_PIX_FMT_VDA}, #endif - {IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD}, + {IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD}, {0, AV_PIX_FMT_NONE} }; |