From 0bd53c9ccbb71f33e48bb90a7ae3587a1fae49c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 12 Apr 2014 17:01:09 +0200 Subject: [PATCH] glimagesink: First handle GL window setup, then create the context and its thread --- ext/gl/gstglimagesink.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c index b75ffaaf3e..dcbbaebf81 100644 --- a/ext/gl/gstglimagesink.c +++ b/ext/gl/gstglimagesink.c @@ -407,9 +407,6 @@ _ensure_gl_setup (GstGLImageSink * gl_sink) GstGLWindow *window; gl_sink->context = gst_gl_context_new (gl_sink->display); - if (!gst_gl_context_create (gl_sink->context, gl_sink->other_context, - &error)) - goto context_error; window = gst_gl_context_get_window (gl_sink->context); @@ -421,6 +418,10 @@ _ensure_gl_setup (GstGLImageSink * gl_sink) gst_gl_window_set_window_handle (window, gl_sink->window_id); } + if (!gst_gl_context_create (gl_sink->context, gl_sink->other_context, + &error)) + goto context_error; + /* setup callbacks */ gst_gl_window_set_resize_callback (window, GST_GL_WINDOW_RESIZE_CB (gst_glimage_sink_on_resize),