mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
Fixes 'format not a string literal and no format arguments' on darwin
This commit is contained in:
Julien Isorce 2012-04-20 10:41:51 +02:00 committed by Tim-Philipp Müller
parent e25b142e24
commit 67bc74ec3f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/gl/gstgldisplay.h
View file

@ -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
{

8
gst-libs/gst/gl/gstglfilter.c
View file

@ -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;
}

4
gst-libs/gst/gl/gstglmixer.c
View file

@ -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;
}