From 443d3a91d335188be15c3bd2616d2cc9c4728566 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 28 Jan 2017 18:27:30 +0100 Subject: vaapi: remove central lock around vaapi API calls The lock was disabled recently. This commit gets rid of the dummied out calls. The main reason for removing it is that there is no apparent need for it anymore, and the new FFmpeg vaapi code does not use or provide such a lock (there are some places which we cannot control and which do vaapi API calls, like frame destructors). --- video/decode/hw_vaapi.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'video/decode/hw_vaapi.c') diff --git a/video/decode/hw_vaapi.c b/video/decode/hw_vaapi.c index 45558cd6e7..2dba5a99bd 100644 --- a/video/decode/hw_vaapi.c +++ b/video/decode/hw_vaapi.c @@ -142,18 +142,6 @@ static int init_copy(struct lavc_ctx *ctx) return init(ctx, false); } -static void intel_shit_lock(struct lavc_ctx *ctx) -{ - struct priv *p = ctx->hwdec_priv; - va_lock(p->ctx); -} - -static void intel_crap_unlock(struct lavc_ctx *ctx) -{ - struct priv *p = ctx->hwdec_priv; - va_unlock(p->ctx); -} - const struct vd_lavc_hwdec mp_vd_lavc_vaapi = { .type = HWDEC_VAAPI, .image_format = IMGFMT_VAAPI, @@ -162,8 +150,6 @@ const struct vd_lavc_hwdec mp_vd_lavc_vaapi = { .init = init_direct, .uninit = uninit, .init_decoder = init_decoder, - .lock = intel_shit_lock, - .unlock = intel_crap_unlock, }; const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy = { -- cgit v1.2.3