diff options
| author | wm4 <wm4@nowhere> | 2017-01-28 18:27:30 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-01-28 18:27:30 +0100 |
| commit | 443d3a91d335188be15c3bd2616d2cc9c4728566 (patch) | |
| tree | 0c3b8aaab56e84a1f807ff88cd6b6b1d4f0c5bbc /video/vaapi.h | |
| parent | d9ef1333c6ada98f4b71c20e0a6aa02ed55983c9 (diff) | |
| download | mpv-443d3a91d335188be15c3bd2616d2cc9c4728566.tar.bz2 mpv-443d3a91d335188be15c3bd2616d2cc9c4728566.tar.xz | |
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).
Diffstat (limited to 'video/vaapi.h')
| -rw-r--r-- | video/vaapi.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/video/vaapi.h b/video/vaapi.h index 01fb4fa980..de7d6d98d8 100644 --- a/video/vaapi.h +++ b/video/vaapi.h @@ -36,7 +36,6 @@ struct mp_vaapi_ctx { struct AVBufferRef *av_device_ref; // AVVAAPIDeviceContext* struct va_image_formats *image_formats; bool gpu_memcpy_message; - pthread_mutex_t lock; // Internal, for va_create_standalone() void *native_ctx; void (*destroy_native_ctx)(void *native_ctx); @@ -46,9 +45,6 @@ bool check_va_status(struct mp_log *log, VAStatus status, const char *msg); #define CHECK_VA_STATUS(ctx, msg) check_va_status((ctx)->log, status, msg) -#define va_lock(ctx) (void)(ctx) -#define va_unlock(ctx) (void)(ctx) - int va_get_colorspace_flag(enum mp_csp csp); struct mp_vaapi_ctx * va_initialize(VADisplay *display, struct mp_log *plog, bool probing); |