summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog26
m---------common0
-rw-r--r--ext/cairo/gsttimeoverlay.c2
-rw-r--r--ext/gdk_pixbuf/pixbufscale.c2
-rw-r--r--ext/jpeg/gstjpegdec.c2
-rw-r--r--ext/jpeg/gstjpegenc.c2
-rw-r--r--ext/jpeg/gstsmokedec.c2
-rw-r--r--ext/jpeg/gstsmokeenc.c2
-rw-r--r--ext/libpng/gstpngdec.c2
-rw-r--r--gst/auparse/gstauparse.c6
-rw-r--r--gst/avi/gstavidemux.c8
-rw-r--r--gst/cutter/gstcutter.c4
-rw-r--r--gst/debug/efence.c4
-rw-r--r--gst/id3demux/id3v2frames.c4
-rw-r--r--gst/matroska/matroska-demux.c5
-rw-r--r--gst/matroska/matroska-mux.c2
-rw-r--r--gst/rtsp/gstrtspsrc.c8
-rw-r--r--gst/wavparse/gstwavparse.c4
-rw-r--r--sys/ximage/ximageutil.c2
19 files changed, 57 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index f8ab59fb..53478602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-10-05 Tim-Philipp Müller <tim at centricular dot net>
+
+ * ext/cairo/gsttimeoverlay.c:
+ (gst_cairo_time_overlay_update_font_height):
+ * ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_transform_caps):
+ * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_parse_image_data):
+ * ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain):
+ * ext/jpeg/gstsmokedec.c: (gst_smokedec_chain):
+ * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain):
+ * ext/libpng/gstpngdec.c: (user_endrow_callback):
+ * gst/auparse/gstauparse.c: (gst_au_parse_parse_header):
+ * gst/avi/gstavidemux.c: (gst_avi_demux_parse_superindex),
+ (gst_avi_demux_parse_subindex), (gst_avi_demux_parse_stream),
+ (gst_avi_demux_stream_data):
+ * gst/cutter/gstcutter.c: (gst_cutter_chain):
+ * gst/debug/efence.c: (gst_efence_buffer_alloc),
+ (gst_fenced_buffer_copy):
+ * gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame):
+ * gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream):
+ * gst/matroska/matroska-mux.c: (gst_matroska_mux_start):
+ * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_send),
+ (gst_rtspsrc_handle_message):
+ * gst/wavparse/gstwavparse.c: (gst_wavparse_stream_headers):
+ * sys/ximage/ximageutil.c: (ximageutil_xcontext_get):
+ Printf format fixes.
+
2006-10-04 Wim Taymans <wim@fluendo.com>
* gst/rtsp/Makefile.am:
diff --git a/common b/common
-Subproject 9991f6fa61ee11475c390dd6675ef7952f079e4
+Subproject a4af1b8542911352e29d53fba47e2c3d7231ebd
diff --git a/ext/cairo/gsttimeoverlay.c b/ext/cairo/gsttimeoverlay.c
index d48242d9..404e6f70 100644
--- a/ext/cairo/gsttimeoverlay.c
+++ b/ext/cairo/gsttimeoverlay.c
@@ -91,7 +91,7 @@ gst_cairo_time_overlay_update_font_height (GstCairoTimeOverlay * timeoverlay)
cairo_set_font_size (font_cairo, 20);
cairo_font_extents (font_cairo, &font_extents);
timeoverlay->text_height = font_extents.height;
- GST_DEBUG_OBJECT (timeoverlay, "font height is %d", font_extents.height);
+ GST_DEBUG_OBJECT (timeoverlay, "font height is %f", font_extents.height);
cairo_destroy (font_cairo);
font_cairo = NULL;
}
diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c
index 9c4907b1..b240528d 100644
--- a/ext/gdk_pixbuf/pixbufscale.c
+++ b/ext/gdk_pixbuf/pixbufscale.c
@@ -253,7 +253,7 @@ gst_pixbufscale_transform_caps (GstBaseTransform * trans,
gst_structure_remove_field (structure, "pixel-aspect-ratio");
}
- GST_DEBUG_OBJECT (trans, "returning caps: %", ret);
+ GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret);
return ret;
}
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index c6d37f71..b5d9985f 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -467,7 +467,7 @@ gst_jpeg_dec_parse_image_data (GstJpegDec * dec)
++data;
continue;
}
- GST_DEBUG ("found sync at 0x%08x", data - size);
+ GST_DEBUG ("found sync at %p", data - size);
}
while (*data == 0xff)
++data;
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index ae91a8a2..107b14db 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -413,7 +413,7 @@ gst_jpegenc_chain (GstPad * pad, GstBuffer * buf)
data = GST_BUFFER_DATA (buf);
size = GST_BUFFER_SIZE (buf);
- GST_DEBUG_OBJECT (jpegenc, "got buffer of %u bytes", size);
+ GST_DEBUG_OBJECT (jpegenc, "got buffer of %lu bytes", size);
ret =
gst_pad_alloc_buffer_and_set_caps (jpegenc->srcpad,
diff --git a/ext/jpeg/gstsmokedec.c b/ext/jpeg/gstsmokedec.c
index c1958178..56e43799 100644
--- a/ext/jpeg/gstsmokedec.c
+++ b/ext/jpeg/gstsmokedec.c
@@ -171,7 +171,7 @@ gst_smokedec_chain (GstPad * pad, GstBuffer * buf)
size = GST_BUFFER_SIZE (buf);
time = GST_BUFFER_TIMESTAMP (buf);
- GST_LOG_OBJECT (smokedec, "got buffer of %u bytes", size);
+ GST_LOG_OBJECT (smokedec, "got buffer of %lu bytes", size);
/* have the ID packet. */
if (data[0] == SMOKECODEC_TYPE_ID) {
diff --git a/ext/jpeg/gstsmokeenc.c b/ext/jpeg/gstsmokeenc.c
index 7cadd985..7f0cbc64 100644
--- a/ext/jpeg/gstsmokeenc.c
+++ b/ext/jpeg/gstsmokeenc.c
@@ -325,7 +325,7 @@ gst_smokeenc_chain (GstPad * pad, GstBuffer * buf)
data = GST_BUFFER_DATA (buf);
size = GST_BUFFER_SIZE (buf);
- GST_LOG_OBJECT (smokeenc, "got buffer of %u bytes", size);
+ GST_LOG_OBJECT (smokeenc, "got buffer of %lu bytes", size);
if (smokeenc->need_header) {
outbuf = gst_buffer_new_and_alloc (256);
diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c
index d43fb401..74c12053 100644
--- a/ext/libpng/gstpngdec.c
+++ b/ext/libpng/gstpngdec.c
@@ -221,7 +221,7 @@ user_endrow_callback (png_structp png_ptr, png_bytep new_row,
if (GST_IS_BUFFER (pngdec->buffer_out)) {
size_t offset = row_num * GST_ROUND_UP_4 (pngdec->rowbytes);
- GST_LOG ("got row %d, copying in buffer %p at offset %d", row_num,
+ GST_LOG ("got row %u, copying in buffer %p at offset %d", (guint) row_num,
pngdec->buffer_out, offset);
memcpy (GST_BUFFER_DATA (pngdec->buffer_out) + offset, new_row,
pngdec->rowbytes);
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index 1450efb1..406e5454 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -268,8 +268,8 @@ gst_au_parse_parse_header (GstAuParse * auparse)
auparse->samplerate = GST_READ_UINT32_BE (head + 16);
auparse->channels = GST_READ_UINT32_BE (head + 20);
- GST_DEBUG_OBJECT (auparse, "offset %ld, size %u, encoding %u, "
- "frequency %u, channels %u", auparse->offset, size,
+ GST_DEBUG_OBJECT (auparse, "offset %" G_GINT64_FORMAT ", size %u, "
+ "encoding %u, frequency %u, channels %u", auparse->offset, size,
auparse->encoding, auparse->samplerate, auparse->channels);
/* Docs:
@@ -389,7 +389,7 @@ gst_au_parse_parse_header (GstAuParse * auparse)
if (!gst_au_parse_add_srcpad (auparse, tempcaps))
goto add_pad_failed;
- GST_DEBUG_OBJECT (auparse, "offset=%ld", auparse->offset);
+ GST_DEBUG_OBJECT (auparse, "offset=%" G_GINT64_FORMAT, auparse->offset);
gst_adapter_flush (auparse->adapter, auparse->offset);
gst_caps_unref (tempcaps);
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 1ed9b27d..aef6995f 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -823,7 +823,7 @@ gst_avi_demux_parse_superindex (GstAviDemux * avi,
if (GST_READ_UINT16_LE (data) != 4 ||
(data[2] & 0xfe) != 0x0 || data[3] != 0x0) {
GST_WARNING_OBJECT (avi,
- "Superindex for stream %d has unexpected "
+ "Superindex for stream has unexpected "
"size_entry %d (bytes) or flags 0x%02x/0x%02x",
GST_READ_UINT16_LE (data), data[2], data[3]);
bpe = GST_READ_UINT16_LE (data) * 4;
@@ -904,7 +904,7 @@ gst_avi_demux_parse_subindex (GstElement * element,
GST_WARNING_OBJECT (element,
"Superindex for stream %d has unexpected "
"size_entry %d (bytes) or flags 0x%02x/0x%02x",
- GST_READ_UINT16_LE (data), data[2], data[3]);
+ stream->num, GST_READ_UINT16_LE (data), data[2], data[3]);
bpe = GST_READ_UINT16_LE (data) * 4;
}
num = GST_READ_UINT32_LE (&data[4]);
@@ -1121,7 +1121,7 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
if (!gst_riff_parse_chunk (element, buf, &offset, &tag, &sub) ||
tag != GST_RIFF_TAG_strh) {
GST_ERROR_OBJECT (avi,
- "Failed to find strh chunk (tag: %" GST_FOURCC_FORMAT ")",
+ "Failed to find strh chunk (bufsize: %d, tag: %" GST_FOURCC_FORMAT ")",
GST_BUFFER_SIZE (buf), GST_FOURCC_ARGS (tag));
goto fail;
} else if (!gst_riff_parse_strh (element, sub, &stream->strh)) {
@@ -3266,7 +3266,7 @@ gst_avi_demux_stream_data (GstAviDemux * avi)
gst_adapter_flush (avi->adapter, 8);
return GST_FLOW_OK;
}
- GST_DEBUG ("chunk ID %" GST_FOURCC_FORMAT ", size %lu",
+ GST_DEBUG ("chunk ID %" GST_FOURCC_FORMAT ", size %u",
GST_FOURCC_ARGS (tag), size);
stream_nr = CHUNKID_TO_STREAMNR (tag);
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index fc75754f..cffa780f 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -260,8 +260,8 @@ gst_cutter_chain (GstPad * pad, GstBuffer * buf)
/* if RMS below threshold, add buffer length to silent run length count
* if not, reset
*/
- GST_LOG_OBJECT (filter, "buffer stats: NMS %f, RMS %f, audio length %f",
- NMS, RMS, gst_audio_duration_from_pad_buffer (filter->sinkpad, buf));
+ GST_LOG_OBJECT (filter, "buffer stats: NMS %f, RMS %f, audio length %f", NMS,
+ RMS, (gdouble) gst_audio_duration_from_pad_buffer (filter->sinkpad, buf));
if (RMS < filter->threshold_level)
filter->silent_run_length +=
gst_guint64_to_gdouble (gst_audio_duration_from_pad_buffer (filter->
diff --git a/gst/debug/efence.c b/gst/debug/efence.c
index 1ef462f3..94eed9eb 100644
--- a/gst/debug/efence.c
+++ b/gst/debug/efence.c
@@ -306,7 +306,7 @@ gst_efence_buffer_alloc (GstPad * pad, guint64 offset,
*buf = buffer;
- GST_DEBUG_OBJECT (efence, "Allocated buffer of size %u, caps: % "
+ GST_DEBUG_OBJECT (efence, "Allocated buffer of size %u, caps: %"
GST_PTR_FORMAT, GST_BUFFER_SIZE (buffer), GST_BUFFER_CAPS (buffer));
return GST_FLOW_OK;
@@ -429,7 +429,7 @@ gst_fenced_buffer_copy (const GstBuffer * buffer)
GST_BUFFER_CAPS (copy) = NULL;
GST_DEBUG ("Copied buffer %p with ts %" GST_TIME_FORMAT
- ", caps: % " GST_PTR_FORMAT, buffer,
+ ", caps: %" GST_PTR_FORMAT, buffer,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (copy)), GST_BUFFER_CAPS (copy));
return GST_FENCED_BUFFER (copy);
diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c
index 96fa88ec..8f4711a7 100644
--- a/gst/id3demux/id3v2frames.c
+++ b/gst/id3demux/id3v2frames.c
@@ -133,8 +133,8 @@ id3demux_id3v2_parse_frame (ID3TagsWorking * work)
}
if (destSize != work->parse_size) {
GST_WARNING
- ("Decompressing ID3v2 frame %s did not produce expected size %d bytes (got %d)",
- tag_name, work->parse_data, destSize);
+ ("Decompressing ID3v2 frame %s did not produce expected size %d bytes (got %lu)",
+ tag_name, work->parse_size, destSize);
return FALSE;
}
#else
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 17120a0e..72d3273c 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -590,7 +590,8 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
case GST_MATROSKA_TRACK_TYPE_LOGO:
case GST_MATROSKA_TRACK_TYPE_CONTROL:
default:
- GST_WARNING ("Unknown or unsupported track type 0x%x", track_type);
+ GST_WARNING ("Unknown or unsupported track type %"
+ G_GUINT64_FORMAT, track_type);
context->type = 0;
break;
}
@@ -890,7 +891,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
}
context->codec_priv = data;
context->codec_priv_size = size;
- GST_LOG_OBJECT (demux, "%u bytes of codec private data", size);
+ GST_LOG_OBJECT (demux, "%u bytes of codec private data", (guint) size);
break;
}
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 59495053..473e2ba3 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1206,7 +1206,7 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
peerpad = gst_pad_get_peer (thepad);
GST_DEBUG_OBJECT (thepad, "querying duration");
if (gst_pad_query_duration (peerpad, &format, &trackduration)) {
- GST_DEBUG_OBJECT (thepad, "%duration: %" GST_TIME_FORMAT,
+ GST_DEBUG_OBJECT (thepad, "duration: %" GST_TIME_FORMAT,
GST_TIME_ARGS (trackduration));
if ((gdouble) trackduration > duration) {
duration = (gdouble) trackduration;
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 2494f532..0ea88313 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -1208,7 +1208,7 @@ send_error:
gchar *str = rtsp_strresult (res);
GST_ELEMENT_ERROR (src, RESOURCE, WRITE, (NULL),
- ("Could not send message. (%s)", res));
+ ("Could not send message. (%s)", str));
g_free (str);
return FALSE;
}
@@ -1845,9 +1845,9 @@ gst_rtspsrc_handle_message (GstBin * bin, GstMessage * message)
/* FIXME, we post an error message now to inform the user
* that nothing happened. It's most likely a firewall thing. */
GST_ELEMENT_ERROR (rtspsrc, RESOURCE, READ, (NULL),
- ("Could not receive any UDP packets for %" G_GUINT64_FORMAT
- ".%d seconds, maybe your firewall is blocking it.",
- rtspsrc->timeout / 1000000, rtspsrc->timeout % 1000000));
+ ("Could not receive any UDP packets for %.4f seconds, maybe your "
+ "firewall is blocking it.",
+ (gdouble) rtspsrc->timeout / 1000000));
return;
}
}
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 558cb063..7ac9bc54 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1183,7 +1183,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
/* We will continue parsing tags 'till end */
wav->offset += size;
}
- GST_DEBUG_OBJECT (wav, "datasize = %ld", size);
+ GST_DEBUG_OBJECT (wav, "datasize = %d", size);
break;
}
case GST_RIFF_TAG_fact:{
@@ -1237,7 +1237,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
wav->bps =
(guint32) gst_util_uint64_scale ((guint64) wav->rate, wav->datasize,
(guint64) wav->fact);
- GST_DEBUG_OBJECT (wav, "calculated bps : %ld", wav->bps);
+ GST_DEBUG_OBJECT (wav, "calculated bps : %d", wav->bps);
}
if (wav->bps <= 0)
goto no_bitrate;
diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c
index 61a5bab7..8e36bb68 100644
--- a/sys/ximage/ximageutil.c
+++ b/sys/ximage/ximageutil.c
@@ -140,7 +140,7 @@ ximageutil_xcontext_get (GstElement * parent, const gchar * display_name)
xcontext = g_new0 (GstXContext, 1);
xcontext->disp = XOpenDisplay (display_name);
- GST_DEBUG_OBJECT (parent, "opened display 0x%x", xcontext->disp);
+ GST_DEBUG_OBJECT (parent, "opened display %p", xcontext->disp);
if (!xcontext->disp) {
g_free (xcontext);
return NULL;
generated by cgit (git 2.34.1) at 2024-05-30 07:05:59 +0000