From 8bf203f536eb1c45c98208444c571042a7f7ee4e Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 1 Feb 2013 00:08:28 +1100 Subject: [PATCH] [665/906] mosaic: fix a couple of assertions --- gst/gl/gstglmosaic.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gst/gl/gstglmosaic.c b/gst/gl/gstglmosaic.c index d2335526dd..0f21d7e28f 100644 --- a/gst/gl/gstglmosaic.c +++ b/gst/gl/gstglmosaic.c @@ -212,7 +212,8 @@ static void gst_gl_mosaic_callback (gpointer stuff) { GstGLMosaic *mosaic = GST_GL_MOSAIC (stuff); - GstGLFuncs *gl = GST_GL_MIXER (mosaic)->display->gl_vtable; + GstGLMixer *mixer = GST_GL_MIXER (mosaic); + GstGLFuncs *gl = mixer->display->gl_vtable; static GLfloat xrot = 0; static GLfloat yrot = 0; @@ -234,7 +235,7 @@ gst_gl_mosaic_callback (gpointer stuff) guint count = 0; - gst_gl_display_clear_shader (NULL); + gst_gl_display_clear_shader (mixer->display); gl->BindTexture (GL_TEXTURE_RECTANGLE_ARB, 0); gl->Disable (GL_TEXTURE_RECTANGLE_ARB); @@ -359,7 +360,7 @@ gst_gl_mosaic_callback (gpointer stuff) gl->Disable (GL_DEPTH_TEST); - gst_gl_display_clear_shader (NULL); + gst_gl_display_clear_shader (mixer->display); xrot += 0.6f; yrot += 0.4f;