From a0d9e15342ad48f51841d4fbfe3ae47e10e45592 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 1 Dec 2017 08:01:08 +0100 Subject: video: refactor hw device creation for hwdec copy modes Lots of shit code for nothing. We probably could just use libavutil's code for all of this. But for now go with this, since it tends to prevent stupid terminal messages during probing (libavutil has no mechanism to selectively suppress errors specifically during probing). Ignores the "emulated" API flag (for avoiding vaapi/vdpau wrappers), but it doesn't matter that much for -copy anyway. --- video/vdpau.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'video/vdpau.h') diff --git a/video/vdpau.h b/video/vdpau.h index 1dab72fe84..118db8cbfe 100644 --- a/video/vdpau.h +++ b/video/vdpau.h @@ -51,6 +51,7 @@ struct vdp_functions { struct mp_vdpau_ctx { struct mp_log *log; Display *x11; + bool close_display; struct mp_hwdec_ctx hwctx; struct AVBufferRef *av_device_ref; @@ -90,10 +91,6 @@ struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, Display *x11 bool probing); void mp_vdpau_destroy(struct mp_vdpau_ctx *ctx); -struct mpv_global; -struct mp_hwdec_ctx *vdpau_create_standalone(struct mpv_global *global, - struct mp_log *plog, bool probing); - int mp_vdpau_handle_preemption(struct mp_vdpau_ctx *ctx, uint64_t *counter); struct mp_image *mp_vdpau_get_video_surface(struct mp_vdpau_ctx *ctx, -- cgit v1.2.3