From 552cd26b43eb22dc480de1e8d597d0ce8a7447cf Mon Sep 17 00:00:00 2001 From: Tristan Matthews Date: Tue, 23 Mar 2010 19:56:48 -0400 Subject: [PATCH] osx: more compiler warning fixes Avoid new warnings. Fixes #613758. --- gst/pnm/gstpnmdec.c | 2 -- sys/osxvideo/osxvideosrc.c | 14 +++++++------- sys/qtwrapper/audiodecoders.c | 2 +- sys/qtwrapper/codecmapping.c | 2 +- sys/qtwrapper/qtutils.c | 6 +++--- sys/qtwrapper/qtutils.h | 2 ++ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gst/pnm/gstpnmdec.c b/gst/pnm/gstpnmdec.c index 41fd9e715f..4ad2766faa 100644 --- a/gst/pnm/gstpnmdec.c +++ b/gst/pnm/gstpnmdec.c @@ -42,8 +42,6 @@ #include -static GstElementClass *parent_class; - static GstStaticPadTemplate gst_pnmdec_src_pad_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB "; " diff --git a/sys/osxvideo/osxvideosrc.c b/sys/osxvideo/osxvideosrc.c index 83a92cded0..ed84619d7f 100644 --- a/sys/osxvideo/osxvideosrc.c +++ b/sys/osxvideo/osxvideosrc.c @@ -323,7 +323,7 @@ typedef struct } video_device; static video_device * -video_device_alloc () +video_device_alloc (void) { video_device *dev; dev = g_malloc (sizeof (video_device)); @@ -637,7 +637,7 @@ gst_osx_video_src_base_init (gpointer gclass) GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - GST_DEBUG (G_STRFUNC); + GST_DEBUG ("%s", G_STRFUNC); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); @@ -658,7 +658,7 @@ gst_osx_video_src_class_init (GstOSXVideoSrcClass * klass) GstPushSrcClass *pushsrc_class; OSErr err; - GST_DEBUG (G_STRFUNC); + GST_DEBUG ("%s", G_STRFUNC); gobject_class = G_OBJECT_CLASS (klass); element_class = GST_ELEMENT_CLASS (klass); @@ -705,7 +705,7 @@ gst_osx_video_src_class_init (GstOSXVideoSrcClass * klass) static void gst_osx_video_src_init (GstOSXVideoSrc * self, GstOSXVideoSrcClass * klass) { - GST_DEBUG_OBJECT (self, G_STRFUNC); + GST_DEBUG_OBJECT (self, "%s", G_STRFUNC); gst_base_src_set_format (GST_BASE_SRC (self), GST_FORMAT_TIME); gst_base_src_set_live (GST_BASE_SRC (self), TRUE); @@ -715,7 +715,7 @@ static void gst_osx_video_src_dispose (GObject * object) { GstOSXVideoSrc *self = GST_OSX_VIDEO_SRC (object); - GST_DEBUG_OBJECT (object, G_STRFUNC); + GST_DEBUG_OBJECT (object, "%s", G_STRFUNC); if (self->device_id) { g_free (self->device_id); @@ -738,7 +738,7 @@ gst_osx_video_src_dispose (GObject * object) static void gst_osx_video_src_finalize (GstOSXVideoSrc * self) { - GST_DEBUG_OBJECT (self, G_STRFUNC); + GST_DEBUG_OBJECT (self, "%s", G_STRFUNC); G_OBJECT_CLASS (parent_class)->finalize (G_OBJECT (self)); } @@ -833,7 +833,7 @@ gst_osx_video_src_set_caps (GstBaseSrc * src, GstCaps * caps) float fps; ComponentResult err; - GST_DEBUG_OBJECT (src, G_STRFUNC); + GST_DEBUG_OBJECT (src, "%s", G_STRFUNC); if (!self->seq_grab) return FALSE; diff --git a/sys/qtwrapper/audiodecoders.c b/sys/qtwrapper/audiodecoders.c index bd8e735291..718d30cb27 100644 --- a/sys/qtwrapper/audiodecoders.c +++ b/sys/qtwrapper/audiodecoders.c @@ -956,7 +956,7 @@ qtwrapper_audio_decoder_base_init (QTWrapperAudioDecoderClass * klass) g_strdup_printf ("QTWrapper SCAudio wrapper for decoder: %s", GST_STR_NULL (info)); gst_element_class_set_details_simple (element_class, - longname "Codec/Decoder/Audio", description, + longname, "Codec/Decoder/Audio", description, "Fluendo , " "Pioneers of the Inevitable "); diff --git a/sys/qtwrapper/codecmapping.c b/sys/qtwrapper/codecmapping.c index 8443d963b0..efbaf93e47 100644 --- a/sys/qtwrapper/codecmapping.c +++ b/sys/qtwrapper/codecmapping.c @@ -47,7 +47,7 @@ #include "qtutils.h" static GstCaps * -audio_caps_from_string (gchar * str) +audio_caps_from_string (const gchar * str) { GstCaps *res; diff --git a/sys/qtwrapper/qtutils.c b/sys/qtwrapper/qtutils.c index 60d894451e..dc032baf53 100644 --- a/sys/qtwrapper/qtutils.c +++ b/sys/qtwrapper/qtutils.c @@ -81,7 +81,7 @@ get_name_info_from_component (Component componentID, tmpname = g_strndup ((*(char **) nameHandle) + 1, **((guint8 **) nameHandle)); *name = g_convert_with_fallback (tmpname, -1, "ASCII", "MAC", - " ", &read, &written, NULL); + (gchar *) " ", &read, &written, NULL); if (!*name) GST_WARNING ("read:%" G_GSIZE_FORMAT ", written:%" G_GSIZE_FORMAT, read, written); @@ -92,8 +92,8 @@ get_name_info_from_component (Component componentID, tmpinfo = g_strndup ((*(char **) infoHandle) + 1, **((guint8 **) infoHandle)); *info = - g_convert_with_fallback (tmpinfo, -1, "ASCII", "MAC", " ", NULL, NULL, - NULL); + g_convert_with_fallback (tmpinfo, -1, "ASCII", "MAC", (gchar *) " ", + NULL, NULL, NULL); g_free (tmpinfo); } diff --git a/sys/qtwrapper/qtutils.h b/sys/qtwrapper/qtutils.h index 0914f23420..496c563fc6 100644 --- a/sys/qtwrapper/qtutils.h +++ b/sys/qtwrapper/qtutils.h @@ -127,6 +127,8 @@ addSInt32ToDictionary (CFMutableDictionaryRef dictionary, CFStringRef key, void dump_cvpixel_buffer (CVPixelBufferRef pixbuf); +void dump_avcc_atom (guint8 * atom); + AudioBufferList *AllocateAudioBufferList(UInt32 numChannels, UInt32 size); void DestroyAudioBufferList(AudioBufferList* list);