From 11f620a96aef746922180eb182bbe098914312ca Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Mon, 11 Aug 2008 19:08:22 +0200 Subject: [PATCH] [151/906] ISO C90 --- gst-libs/gst/gl/gstgldisplay.c | 13 ++++++++----- gst/gl/Makefile.am | 2 -- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index 2ebe42f627..921a2a3502 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -1724,10 +1724,11 @@ gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid { gchar string_size[512]; + GQueue* sub_texture_pool = NULL; + sprintf (string_size, "%dx%d", width, height); - + sub_texture_pool = g_datalist_get_data(&display->texture_pool, string_size); //if the size is known - GQueue* sub_texture_pool = g_datalist_get_data(&display->texture_pool, string_size); if (sub_texture_pool) { //check if there is a texture available in the pool @@ -1781,10 +1782,12 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid //The pool of textures is deleted in the GstGLDisplay destructor gchar string_size[512]; + GQueue* sub_texture_pool = NULL; + GstGLDisplayTex* tex = NULL; + sprintf (string_size, "%dx%d", width, height); - + sub_texture_pool = g_datalist_get_data(&display->texture_pool, string_size); //if the size is known - GQueue* sub_texture_pool = g_datalist_get_data(&display->texture_pool, string_size); if (!sub_texture_pool) { sub_texture_pool = g_queue_new (); @@ -1793,7 +1796,7 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid } //contruct a sub texture pool element - GstGLDisplayTex* tex = g_new0 (GstGLDisplayTex, 1); + tex = g_new0 (GstGLDisplayTex, 1); tex->texture = *pTexture; *pTexture = 0; diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am index 14a4e95746..690ee9639a 100644 --- a/gst/gl/Makefile.am +++ b/gst/gl/Makefile.am @@ -16,8 +16,6 @@ libgstopengl_la_SOURCES = \ gstglfilterblur.h \ gstglfiltercube.c \ gstglfiltercube.h \ - gstglfilteredge.c \ - gstglfilteredge.h \ gstglfilterlaplacian.c \ gstglfilterlaplacian.h \ gstglfilterapp.c \