summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-22 12:25:51 +0100
committerwm4 <wm4@nowhere>2013-12-22 12:25:51 +0100
commita0e89daf49d429d05b1a87886f0f834648a2ff36 (patch)
tree43b220953b77037e1cf81ae1cceed3a15591d8b7
parentbd5e0a2ba29cf666db474cd9e85dbef1bff050a7 (diff)
downloadmpv-a0e89daf49d429d05b1a87886f0f834648a2ff36.tar.bz2
mpv-a0e89daf49d429d05b1a87886f0f834648a2ff36.tar.xz
gl_lcms: actually acquire mutex
Prevents race conditions (which can happen only in theory anyway).
-rw-r--r--video/out/gl_lcms.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c
index 958e207951..01e40f9e92 100644
--- a/video/out/gl_lcms.c
+++ b/video/out/gl_lcms.c
@@ -86,8 +86,10 @@ const struct m_sub_options mp_icc_conf = {
static void lcms2_error_handler(cmsContext ctx, cmsUInt32Number code,
const char *msg)
{
+ pthread_mutex_lock(&lcms2_dumb_crap_lock);
if (lcms2_dumb_crap)
mp_msg(lcms2_dumb_crap, MSGL_ERR, "lcms2: %s\n", msg);
+ pthread_mutex_unlock(&lcms2_dumb_crap_lock);
}
static struct bstr load_file(void *talloc_ctx, const char *filename,