From 67bc74ec3fcc28cf2894ce8eaa3277d7696952d2 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Fri, 20 Apr 2012 10:41:51 +0200 Subject: [PATCH] [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 --- gst-libs/gst/gl/gstgldisplay.h | 2 +- gst-libs/gst/gl/gstglfilter.c | 8 ++++---- gst-libs/gst/gl/gstglmixer.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index 5645b9dab0..f657e1e543 100644 --- 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 8ea6772d61..eb59a5fbfa 100644 --- 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 3b2f4c03f0..745ca1d1fa 100644 --- 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; }