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/out/opengl/hwdec_vaglx.c | |
| 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/out/opengl/hwdec_vaglx.c')
| -rw-r--r-- | video/out/opengl/hwdec_vaglx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/video/out/opengl/hwdec_vaglx.c b/video/out/opengl/hwdec_vaglx.c index ac817d79c4..6248a64434 100644 --- a/video/out/opengl/hwdec_vaglx.c +++ b/video/out/opengl/hwdec_vaglx.c @@ -181,14 +181,12 @@ static int map_frame(struct gl_hwdec *hw, struct mp_image *hw_image, if (!p->pixmap) return -1; - va_lock(p->ctx); status = vaPutSurface(p->display, va_surface_id(hw_image), p->pixmap, 0, 0, hw_image->w, hw_image->h, 0, 0, hw_image->w, hw_image->h, NULL, 0, va_get_colorspace_flag(hw_image->params.color.space)); CHECK_VA_STATUS(p, "vaPutSurface()"); - va_unlock(p->ctx); *out_frame = (struct gl_hwdec_frame){ .planes = { |