From 36419f2f79624dd30f7ab90bb653d8eb6074d150 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 31 Mar 2015 16:27:00 +0200 Subject: [PATCH] glvideomixer: Don't use context if not present Avoids assertions at runtime --- ext/gl/gstglvideomixer.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c index c399e924e1..cbba72a5d7 100644 --- a/ext/gl/gstglvideomixer.c +++ b/ext/gl/gstglvideomixer.c @@ -709,21 +709,23 @@ static void gst_gl_video_mixer_reset (GstGLMixer * mixer) { GstGLVideoMixer *video_mixer = GST_GL_VIDEO_MIXER (mixer); + GstGLContext *context = GST_GL_BASE_MIXER (mixer)->context; video_mixer->input_frames = NULL; + GST_DEBUG_OBJECT (mixer, "context:%p", context); + if (video_mixer->shader) - gst_gl_context_del_shader (GST_GL_BASE_MIXER (mixer)->context, - video_mixer->shader); + gst_gl_context_del_shader (context, video_mixer->shader); video_mixer->shader = NULL; if (video_mixer->checker) - gst_gl_context_del_shader (GST_GL_BASE_MIXER (mixer)->context, - video_mixer->checker); + gst_gl_context_del_shader (context, video_mixer->checker); video_mixer->checker = NULL; - gst_gl_context_thread_add (GST_GL_BASE_MIXER (mixer)->context, - (GstGLContextThreadFunc) _reset_gl, mixer); + if (GST_GL_BASE_MIXER (mixer)->context) + gst_gl_context_thread_add (context, (GstGLContextThreadFunc) _reset_gl, + mixer); } static gboolean