From ab8990c89f2742c24e816f6534d38b73320ba8e1 Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Thu, 6 Nov 2014 23:55:20 +0100 Subject: [PATCH] glimagesink: fix possible deadlock on osx Remove gst_glimage_sink_handle_events call in gst_glimage_sink_init. It was unnecessary and when the element was instantiated from the main thread, caused a deadlock in OSX creating the context (thread). --- ext/gl/gstglimagesink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c index 84daeb4167..1f06120a73 100644 --- a/ext/gl/gstglimagesink.c +++ b/ext/gl/gstglimagesink.c @@ -364,10 +364,9 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink) glimage_sink->pool = NULL; glimage_sink->stored_buffer = NULL; glimage_sink->redisplay_texture = 0; + glimage_sink->handle_events = TRUE; g_mutex_init (&glimage_sink->drawing_lock); - - gst_glimage_sink_handle_events (GST_VIDEO_OVERLAY (glimage_sink), TRUE); } static void