diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-27 11:24:37 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-27 11:25:20 +0100 |
| commit | 144d43bceff9d9d3c8bf0fdb061f0ce99073c880 (patch) | |
| tree | db9906f4c6399e3672344acfe594213fe4d15854 | |
| parent | a189cef9c87734b7238152c02f662fef27ff74fd (diff) | |
assrender, ivfparse, jpegformat: fix compiler warnings with debugging disabled in core
| -rw-r--r-- | ext/assrender/gstassrender.c | 4 | ||||
| -rw-r--r-- | gst/ivfparse/gstivfparse.c | 8 | ||||
| -rw-r--r-- | gst/jpegformat/gstjifmux.c | 9 |
3 files changed, 12 insertions, 9 deletions
diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c index 480ad26d1..6cce9b259 100644 --- a/ext/assrender/gstassrender.c +++ b/ext/assrender/gstassrender.c @@ -157,9 +157,9 @@ gst_ass_render_class_init (GstAssRenderClass * klass) #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907000 static void -_libass_message_cb (gint level, const gchar * fmt, va_list args, gpointer data) +_libass_message_cb (gint level, const gchar * fmt, va_list args, + gpointer render) { - GstAssRender *render = GST_ASS_RENDER (data); gchar *message = g_strdup_vprintf (fmt, args); if (level < 2) diff --git a/gst/ivfparse/gstivfparse.c b/gst/ivfparse/gstivfparse.c index a62180140..da5efa71b 100644 --- a/gst/ivfparse/gstivfparse.c +++ b/gst/ivfparse/gstivfparse.c @@ -188,7 +188,10 @@ gst_ivfparse_chain (GstPad * pad, GstBuffer * buf) guint16 height = GST_READ_UINT16_LE (data + 14); guint32 rate_num = GST_READ_UINT32_LE (data + 16); guint32 rate_den = GST_READ_UINT32_LE (data + 20); +#ifndef GST_DISABLE_GST_DEBUG guint32 num_frames = GST_READ_UINT32_LE (data + 24); +#endif + /* last 4 bytes unused */ gst_adapter_flush (ivf->adapter, 32); @@ -233,8 +236,9 @@ gst_ivfparse_chain (GstPad * pad, GstBuffer * buf) guint32 frame_size = GST_READ_UINT32_LE (data); guint64 frame_pts = GST_READ_UINT64_LE (data + 4); - GST_LOG_OBJECT (ivf, "Read frame header: size %u, pts %" G_GUINT64_FORMAT, - frame_size, frame_pts); + GST_LOG_OBJECT (ivf, + "Read frame header: size %u, pts %" G_GUINT64_FORMAT, frame_size, + frame_pts); if (gst_adapter_available (ivf->adapter) >= 12 + frame_size) { GstBuffer *frame; diff --git a/gst/jpegformat/gstjifmux.c b/gst/jpegformat/gstjifmux.c index 43e562323..bb66a1f51 100644 --- a/gst/jpegformat/gstjifmux.c +++ b/gst/jpegformat/gstjifmux.c @@ -182,13 +182,12 @@ gst_jif_mux_finalize (GObject * object) static gboolean gst_jif_mux_sink_setcaps (GstPad * pad, GstCaps * caps) { - GstJifMux *self = GST_JIF_MUX (GST_PAD_PARENT (pad)); GstStructure *s = gst_caps_get_structure (caps, 0); const gchar *variant; /* should be {combined (default), EXIF, JFIF} */ if ((variant = gst_structure_get_string (s, "variant")) != NULL) { - GST_INFO_OBJECT (self, "muxing to '%s'", variant); + GST_INFO_OBJECT (pad, "muxing to '%s'", variant); /* FIXME: do we want to switch it like this or use a gobject property ? */ } @@ -635,7 +634,6 @@ static GstFlowReturn gst_jif_mux_chain (GstPad * pad, GstBuffer * buf) { GstJifMux *self = GST_JIF_MUX (GST_PAD_PARENT (pad)); - guint8 *data = GST_BUFFER_DATA (buf); GstFlowReturn fret = GST_FLOW_OK; if (GST_BUFFER_CAPS (buf) == NULL) { @@ -644,8 +642,9 @@ gst_jif_mux_chain (GstPad * pad, GstBuffer * buf) return GST_FLOW_NOT_NEGOTIATED; } - GST_MEMDUMP ("jpeg beg", data, 64); - GST_MEMDUMP ("jpeg end", &data[GST_BUFFER_SIZE (buf) - 64], 64); + GST_MEMDUMP ("jpeg beg", GST_BUFFER_DATA (buf), 64); + GST_MEMDUMP ("jpeg end", GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf) - 64, + 64); /* we should have received a whole picture from SOI to EOI * build a list of markers */ |