From b299a3f54656095bd0f038360721d29356c7049d Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 16 Oct 2017 18:19:19 +0200 Subject: vdpau: remove some more dead code --- video/vdpau.c | 8 -------- video/vdpau.h | 3 --- 2 files changed, 11 deletions(-) (limited to 'video') diff --git a/video/vdpau.c b/video/vdpau.c index efed6d7f0c..4aa1a86597 100644 --- a/video/vdpau.c +++ b/video/vdpau.c @@ -370,7 +370,6 @@ struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, Display *x11 .ctx = ctx, .restore_device = recheck_preemption, }, - .getimg_surface = VDP_INVALID_HANDLE, }; mpthread_mutex_init_recursive(&ctx->preempt_lock); pthread_mutex_init(&ctx->pool_lock, NULL); @@ -409,13 +408,6 @@ void mp_vdpau_destroy(struct mp_vdpau_ctx *ctx) } } - if (ctx->getimg_mixer) - mp_vdpau_mixer_destroy(ctx->getimg_mixer); - if (ctx->getimg_surface != VDP_INVALID_HANDLE) { - vdp_st = vdp->output_surface_destroy(ctx->getimg_surface); - CHECK_VDP_WARNING(ctx, "Error when calling vdp_output_surface_destroy"); - } - av_buffer_unref(&ctx->av_device_ref); if (ctx->preemption_obj != VDP_INVALID_HANDLE) { diff --git a/video/vdpau.h b/video/vdpau.h index a224229cbb..1dab72fe84 100644 --- a/video/vdpau.h +++ b/video/vdpau.h @@ -84,9 +84,6 @@ struct mp_vdpau_ctx { bool in_use; int64_t age; } video_surfaces[MAX_VIDEO_SURFACES]; - struct mp_vdpau_mixer *getimg_mixer; - VdpOutputSurface getimg_surface; - int getimg_w, getimg_h; }; struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, Display *x11, -- cgit v1.2.3