mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 18:20:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

sdlshare: Destroy GL backend buffer before the GL Context

Browse source 
This was otherwise leading to a deadlock in the GL library.
This commit is contained in:
Nicolas Dufresne 2017-11-24 17:06:22 -05:00 committed by Tim-Philipp Müller
parent 9e208ba0b6
commit ecab99a7a9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/examples/gl/sdl/sdlshare.c
View file

@ -394,15 +394,6 @@ main (int argc, char **argv)
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
gst_object_unref (pipeline); 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 /* make sure there is no pending gst gl buffer in the communication queues
* between sdl and gst-gl * between sdl and gst-gl
*/ */
@ -416,5 +407,14 @@ main (int argc, char **argv)
gst_buffer_unref (buf); 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; return 0;
} }