Commit ecab99a7 authored by Nicolas Dufresne's avatar Nicolas Dufresne Committed by Tim-Philipp Müller

sdlshare: Destroy GL backend buffer before the GL Context

This was otherwise leading to a deadlock in the GL library.
parent 9e208ba0
......@@ -394,15 +394,6 @@ main (int argc, char **argv)
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
gst_object_unref (pipeline);
/* turn on back sdl opengl context */
#ifdef WIN32
wglMakeCurrent (sdl_dc, sdl_gl_context);
#else
glXMakeCurrent (sdl_display, None, 0);
#endif
SDL_Quit ();
/* make sure there is no pending gst gl buffer in the communication queues
* between sdl and gst-gl
*/
......@@ -416,5 +407,14 @@ main (int argc, char **argv)
gst_buffer_unref (buf);
}
/* turn on back sdl opengl context */
#ifdef WIN32
wglMakeCurrent (sdl_dc, sdl_gl_context);
#else
glXMakeCurrent (sdl_display, None, 0);
#endif
SDL_Quit ();
return 0;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment