[498/906] gldisplay: don't pass non-constant strings as printf format strings

Fixes 'format not a string literal and no format arguments' on darwin

diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h
index 5645b9d..f657e1e 100644 (file)
--- a/gst-libs/gst/gl/gstgldisplay.h
+++ b/gst-libs/gst/gl/gstgldisplay.h
@@ -78,7 +78,7 @@ typedef void (*GstGLDisplayThreadFunc) (GstGLDisplay * display, gpointer data);
 typedef void (*GLCB) (gint, gint, guint, gpointer stuff);
 typedef void (*GLCB_V2) (gpointer stuff);
 
-#define GST_GL_DISPLAY_ERR_MSG(obj) (GST_GL_DISPLAY_CAST(obj)->error_message)
+#define GST_GL_DISPLAY_ERR_MSG(obj) ("%s", GST_GL_DISPLAY_CAST(obj)->error_message)
 
 struct _GstGLDisplay
 {

diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c
index 8ea6772..eb59a5f 100644 (file)
--- a/gst-libs/gst/gl/gstglfilter.c
+++ b/gst-libs/gst/gl/gstglfilter.c
@@ -270,7 +270,7 @@ gst_gl_filter_start (GstBaseTransform * bt)
 
       if (!isPerformed)
         GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
-            (GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
+            GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
     }
   }
 
@@ -407,7 +407,7 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret) {
     GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
     return FALSE;
   }
 
@@ -420,7 +420,7 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret) {
     GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
     return FALSE;
   }
 
@@ -429,7 +429,7 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret) {
     GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
     return FALSE;
   }
 

diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c
index 3b2f4c0..745ca1d 100644 (file)
--- a/gst-libs/gst/gl/gstglmixer.c
+++ b/gst-libs/gst/gl/gstglmixer.c
@@ -638,7 +638,7 @@ gst_gl_mixer_query (GstPad * pad, GstQuery * query)
                 sink_pad->display, NULL);
           else
             GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
-                (GST_GL_DISPLAY_ERR_MSG (sink_pad->display)), (NULL));
+                GST_GL_DISPLAY_ERR_MSG (sink_pad->display), (NULL));
 
           /* does not work:
            * res = gst_pad_query_default (GST_PAD_CAST (sink_pad), query);*/
@@ -704,7 +704,7 @@ gst_gl_mixer_setcaps (GstPad * pad, GstCaps * caps)
   if (!gst_gl_display_gen_fbo (mix->display, mix->width, mix->height,
           &mix->fbo, &mix->depthbuffer)) {
     GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (mix->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (mix->display), (NULL));
     gst_object_unref (mix);
     return FALSE;
   }

diff --git a/gst/gl/effects/gstgleffectbulge.c b/gst/gl/effects/gstgleffectbulge.c
index d262925..981d835 100644 (file)
--- a/gst/gl/effects/gstgleffectbulge.c
+++ b/gst/gl/effects/gstgleffectbulge.c
@@ -40,7 +40,7 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize bulge shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectfisheye.c b/gst/gl/effects/gstgleffectfisheye.c
index dbfe764..e5f519a 100644 (file)
--- a/gst/gl/effects/gstgleffectfisheye.c
+++ b/gst/gl/effects/gstgleffectfisheye.c
@@ -40,7 +40,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize fisheye shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectglow.c b/gst/gl/effects/gstgleffectglow.c
index 225e336..fa19208 100644 (file)
--- a/gst/gl/effects/gstgleffectglow.c
+++ b/gst/gl/effects/gstgleffectglow.c
@@ -43,7 +43,7 @@ gst_gl_effects_glow_step_one (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize luma threshold shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -85,7 +85,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize hconv7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -124,7 +124,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize vcon7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -163,7 +163,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize sum shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectlumatocurve.c b/gst/gl/effects/gstgleffectlumatocurve.c
index 5cd3ef2..599d35c 100644 (file)
--- a/gst/gl/effects/gstgleffectlumatocurve.c
+++ b/gst/gl/effects/gstgleffectlumatocurve.c
@@ -40,7 +40,7 @@ gst_gl_effects_luma_to_curve (GstGLEffects * effects,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize luma to curve shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectmirror.c b/gst/gl/effects/gstgleffectmirror.c
index 3964590..b0969bb 100644 (file)
--- a/gst/gl/effects/gstgleffectmirror.c
+++ b/gst/gl/effects/gstgleffectmirror.c
@@ -48,8 +48,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
         error = NULL;
         gst_gl_shader_use (NULL);
         GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-            (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)),
-            (NULL));
+            GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
       } else {
         effects->draw_attr_position_loc =
             gst_gl_shader_get_attribute_location (shader, "a_position");
@@ -65,7 +64,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize mirror shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectrgbtocurve.c b/gst/gl/effects/gstgleffectrgbtocurve.c
index f397536..a2fe0d5 100644 (file)
--- a/gst/gl/effects/gstgleffectrgbtocurve.c
+++ b/gst/gl/effects/gstgleffectrgbtocurve.c
@@ -40,7 +40,7 @@ gst_gl_effects_rgb_to_curve (GstGLEffects * effects,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize rgb to curve shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectsin.c b/gst/gl/effects/gstgleffectsin.c
index fe8843f..035e542 100644 (file)
--- a/gst/gl/effects/gstgleffectsin.c
+++ b/gst/gl/effects/gstgleffectsin.c
@@ -40,7 +40,7 @@ gst_gl_effects_sin_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize sin shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectsquare.c b/gst/gl/effects/gstgleffectsquare.c
index 19fd0e0..9ad4b39 100644 (file)
--- a/gst/gl/effects/gstgleffectsquare.c
+++ b/gst/gl/effects/gstgleffectsquare.c
@@ -40,7 +40,7 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize square shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectsqueeze.c b/gst/gl/effects/gstgleffectsqueeze.c
index 9287818..1b51e62 100644 (file)
--- a/gst/gl/effects/gstgleffectsqueeze.c
+++ b/gst/gl/effects/gstgleffectsqueeze.c
@@ -49,8 +49,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
         error = NULL;
         gst_gl_shader_use (NULL);
         GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-            (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)),
-            (NULL));
+            GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
       } else {
         effects->draw_attr_position_loc =
             gst_gl_shader_get_attribute_location (shader, "a_position");
@@ -66,7 +65,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize squeeze shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
   glMatrixMode (GL_PROJECTION);

diff --git a/gst/gl/effects/gstgleffectstretch.c b/gst/gl/effects/gstgleffectstretch.c
index ef28bfd..a1fcabd 100644 (file)
--- a/gst/gl/effects/gstgleffectstretch.c
+++ b/gst/gl/effects/gstgleffectstretch.c
@@ -40,7 +40,7 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize stretch shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffecttunnel.c b/gst/gl/effects/gstgleffecttunnel.c
index 3d0ec94..bc10aec 100644 (file)
--- a/gst/gl/effects/gstgleffecttunnel.c
+++ b/gst/gl/effects/gstgleffecttunnel.c
@@ -40,7 +40,7 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize tunnel shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffecttwirl.c b/gst/gl/effects/gstgleffecttwirl.c
index 02db522..f8b375b 100644 (file)
--- a/gst/gl/effects/gstgleffecttwirl.c
+++ b/gst/gl/effects/gstgleffecttwirl.c
@@ -40,7 +40,7 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize twirl shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/effects/gstgleffectxray.c b/gst/gl/effects/gstgleffectxray.c
index 1badfbf..dc23908 100644 (file)
--- a/gst/gl/effects/gstgleffectxray.c
+++ b/gst/gl/effects/gstgleffectxray.c
@@ -59,7 +59,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize hconv7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -98,7 +98,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize vconv7 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -138,7 +138,7 @@ gst_gl_effects_xray_desaturate (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize desaturate shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -175,7 +175,7 @@ gst_gl_effects_xray_sobel_hconv (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize sobel hvonc3 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -212,7 +212,7 @@ gst_gl_effects_xray_sobel_vconv (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize sobel vconv3 shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -249,7 +249,7 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize seobel length shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 
@@ -289,7 +289,7 @@ gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
     gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
         "Failed to initialize multiply shader");
     GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
     return;
   }
 

diff --git a/gst/gl/gstglcolorscale.c b/gst/gl/gstglcolorscale.c
index 930a26d..28bec54 100644 (file)
--- a/gst/gl/gstglcolorscale.c
+++ b/gst/gl/gstglcolorscale.c
@@ -394,7 +394,7 @@ gst_gl_colorscale_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret) {
     GST_ELEMENT_ERROR (colorscale, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (colorscale->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (colorscale->display), (NULL));
     return FALSE;
   }
   //blocking call, init colorspace conversion if needed
@@ -405,7 +405,7 @@ gst_gl_colorscale_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret) {
     GST_ELEMENT_ERROR (colorscale, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (colorscale->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (colorscale->display), (NULL));
     return FALSE;
   }
   //blocking call, init colorspace conversion if needed
@@ -415,7 +415,7 @@ gst_gl_colorscale_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret)
     GST_ELEMENT_ERROR (colorscale, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (colorscale->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (colorscale->display), (NULL));
 
   return ret;
 }

diff --git a/gst/gl/gstgldifferencematte.c b/gst/gl/gstgldifferencematte.c
index cac4154..f135262 100644 (file)
--- a/gst/gl/gstgldifferencematte.c
+++ b/gst/gl/gstgldifferencematte.c
@@ -103,7 +103,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize difference shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
         (NULL));
     return;
   }
@@ -113,7 +113,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize hconv7 shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
         (NULL));
     return;
   }
@@ -123,7 +123,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize vconv7 shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
         (NULL));
     return;
   }
@@ -133,7 +133,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
     gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
         "Failed to initialize interp shader");
     GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
+        GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
         (NULL));
     return;
   }

diff --git a/gst/gl/gstgldownload.c b/gst/gl/gstgldownload.c
index af43122..e30111f 100644 (file)
--- a/gst/gl/gstgldownload.c
+++ b/gst/gl/gstgldownload.c
@@ -259,7 +259,7 @@ gst_gl_download_start (GstBaseTransform * bt)
   download->display = gst_gl_display_new ();
   if (!gst_gl_display_create_context (download->display, 0)) {
     GST_ELEMENT_ERROR (download, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (download->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (download->display), (NULL));
     return FALSE;
   }
 
@@ -356,7 +356,7 @@ gst_gl_download_set_caps (GstBaseTransform * bt, GstCaps * incaps,
       download->width, download->height);
   if (!ret)
     GST_ELEMENT_ERROR (download, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (download->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (download->display), (NULL));
 
   return ret;
 }

diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c
index 8bca3a8..d57f5b5 100644 (file)
--- a/gst/gl/gstglimagesink.c
+++ b/gst/gl/gstglimagesink.c
@@ -426,7 +426,7 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition)
         ok = gst_gl_display_create_context (glimage_sink->display, 0);
         if (!ok) {
           GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
-              (GST_GL_DISPLAY_ERR_MSG (glimage_sink->display)), (NULL));
+              GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
 
           if (glimage_sink->display) {
             g_object_unref (glimage_sink->display);
@@ -539,7 +539,7 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
 
     if (!ok) {
       GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
-          (GST_GL_DISPLAY_ERR_MSG (glimage_sink->display)), (NULL));
+          GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
       return FALSE;
     }
   }
@@ -662,7 +662,7 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
     return GST_FLOW_OK;
   else {
     GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (glimage_sink->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
     return GST_FLOW_ERROR;
   }
 }

diff --git a/gst/gl/gstgltestsrc.c b/gst/gl/gstgltestsrc.c
index a7ca2cd..9c1c1bc 100644 (file)
--- a/gst/gl/gstgltestsrc.c
+++ b/gst/gl/gstgltestsrc.c
@@ -392,7 +392,7 @@ gst_gl_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
 
     if (!res)
       GST_ELEMENT_ERROR (gltestsrc, RESOURCE, NOT_FOUND,
-          (GST_GL_DISPLAY_ERR_MSG (gltestsrc->display)), (NULL));
+          GST_GL_DISPLAY_ERR_MSG (gltestsrc->display), (NULL));
   }
   return res;
 }
@@ -651,7 +651,7 @@ gst_gl_test_src_start (GstBaseSrc * basesrc)
 
       if (!isPerformed)
         GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
-            (GST_GL_DISPLAY_ERR_MSG (src->display)), (NULL));
+            GST_GL_DISPLAY_ERR_MSG (src->display), (NULL));
     }
   }
 

diff --git a/gst/gl/gstglupload.c b/gst/gl/gstglupload.c
index 30cc37e..09bc96d 100644 (file)
--- a/gst/gl/gstglupload.c
+++ b/gst/gl/gstglupload.c
@@ -305,7 +305,7 @@ gst_gl_upload_start (GstBaseTransform * bt)
 
       if (!isPerformed)
         GST_ELEMENT_ERROR (upload, RESOURCE, NOT_FOUND,
-            (GST_GL_DISPLAY_ERR_MSG (upload->display)), (NULL));
+            GST_GL_DISPLAY_ERR_MSG (upload->display), (NULL));
     }
   }
 
@@ -511,7 +511,7 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps,
 
   if (!ret)
     GST_ELEMENT_ERROR (upload, RESOURCE, NOT_FOUND,
-        (GST_GL_DISPLAY_ERR_MSG (upload->display)), (NULL));
+        GST_GL_DISPLAY_ERR_MSG (upload->display), (NULL));
 
   return ret;
 }