diff options
| author | wm4 <wm4@nowhere> | 2017-04-23 15:56:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-04-23 16:07:03 +0200 |
| commit | f59371de2170141fc28540d03c4e7ecc62844ebf (patch) | |
| tree | f741cb2f05e218bd361f6a3b142cab152cf2902f /video/decode/vd_lavc.c | |
| parent | 1d0a858447cee977c9b4faa65d163100f20d4047 (diff) | |
| download | mpv-f59371de2170141fc28540d03c4e7ecc62844ebf.tar.bz2 mpv-f59371de2170141fc28540d03c4e7ecc62844ebf.tar.xz | |
video: drop vaapi/vdpau hw decoding support with FFmpeg 3.2
This drops support for the old libavcodec APIs. Now FFmpeg 3.3 or FFmpeg
git is required. Libav has no release with the new APIs yet, so for
Libav git as of a few weeks or months ago or so is required if you want
to use Libav.
Not much actually changes in hwdec_vaegl.c - some code is removed, but
the reindentation inflates the diff.
Diffstat (limited to 'video/decode/vd_lavc.c')
| -rw-r--r-- | video/decode/vd_lavc.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e78b5812ec..503a3db38a 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -169,7 +169,6 @@ static const struct vd_lavc_hwdec mp_vd_lavc_crystalhd = { }; #if HAVE_VAAPI_HWACCEL -#if HAVE_VAAPI_HWACCEL_NEW const struct vd_lavc_hwdec mp_vd_lavc_vaapi = { .type = HWDEC_VAAPI, .image_format = IMGFMT_VAAPI, @@ -197,14 +196,9 @@ const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy = { {AV_PIX_FMT_NONE} }, }; -#else -extern const struct vd_lavc_hwdec mp_vd_lavc_vaapi; -extern const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy; -#endif #endif #if HAVE_VDPAU_HWACCEL -#if HAVE_VDPAU_HWACCEL_NEW const struct vd_lavc_hwdec mp_vd_lavc_vdpau = { .type = HWDEC_VDPAU, .image_format = IMGFMT_VDPAU, @@ -228,10 +222,6 @@ const struct vd_lavc_hwdec mp_vd_lavc_vdpau_copy = { {AV_PIX_FMT_NONE} }, }; -#else -extern const struct vd_lavc_hwdec mp_vd_lavc_vdpau; -extern const struct vd_lavc_hwdec mp_vd_lavc_vdpau_copy; -#endif #endif static const struct vd_lavc_hwdec *const hwdec_list[] = { @@ -239,7 +229,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_rpi, &mp_vd_lavc_rpi_copy, #endif -#if HAVE_VDPAU_HWACCEL_OLD || HAVE_VDPAU_HWACCEL_NEW +#if HAVE_VDPAU_HWACCEL &mp_vd_lavc_vdpau, &mp_vd_lavc_vdpau_copy, #endif @@ -247,7 +237,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_videotoolbox, &mp_vd_lavc_videotoolbox_copy, #endif -#if HAVE_VAAPI_HWACCEL_OLD || HAVE_VAAPI_HWACCEL_NEW +#if HAVE_VAAPI_HWACCEL &mp_vd_lavc_vaapi, &mp_vd_lavc_vaapi_copy, #endif @@ -584,7 +574,7 @@ static void init_avctx(struct dec_video *vd, const char *decoder, if (ctx->hwdec) { avctx->thread_count = 1; -#if HAVE_VDPAU_HWACCEL_NEW +#if HAVE_VDPAU_HWACCEL avctx->hwaccel_flags |= AV_HWACCEL_FLAG_IGNORE_LEVEL; #endif if (ctx->hwdec->image_format) |