From 2ce7face96c3c08582cd4aebf59aa99a9d741a7f Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 20 Dec 2017 00:29:22 +0100 Subject: hwdec: remove unused fields These were replaced by a different mechanism, but the old fields weren't removed. --- video/hwdec.h | 6 ------ video/vaapi.c | 2 -- video/vdpau.c | 1 - 3 files changed, 9 deletions(-) diff --git a/video/hwdec.h b/video/hwdec.h index 80d5cfcecc..1022654d85 100644 --- a/video/hwdec.h +++ b/video/hwdec.h @@ -15,12 +15,6 @@ struct mp_hwdec_ctx { // List of IMGFMT_s, terminated with 0. NULL if N/A. int *supported_formats; - - // Hint to generic code: it's using a wrapper API - bool emulated; - - // Optional. Do not set for VO-bound devices. - void (*destroy)(struct mp_hwdec_ctx *ctx); }; // Used to communicate hardware decoder device handles from VO to video decoder. diff --git a/video/vaapi.c b/video/vaapi.c index c3327ce305..152b52f60c 100644 --- a/video/vaapi.c +++ b/video/vaapi.c @@ -176,8 +176,6 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, if (av_hwdevice_ctx_init(res->av_device_ref) < 0) goto error; - res->hwctx.emulated = va_guess_if_emulated(res); - return res; error: diff --git a/video/vdpau.c b/video/vdpau.c index 7d0ff145b0..6e3d0ac8a9 100644 --- a/video/vdpau.c +++ b/video/vdpau.c @@ -563,7 +563,6 @@ static struct AVBufferRef *vdpau_create_standalone(struct mpv_global *global, return NULL; } - vdp->hwctx.emulated = mp_vdpau_guess_if_emulated(vdp); vdp->close_display = true; return vdp->hwctx.av_device_ref; } -- cgit v1.2.3