summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-10-10 12:28:34 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-10-10 12:28:34 +0000
commit9df30524b5c44def3d924e77028b95b2b1c51b89 (patch)
tree4dcbb68aa74f7e3610965d2f905be5d4f2172fba
parent539627e049bf58a3454ad9894d24ded25d269ef6 (diff)
downloadgstreamer-plugins-good-9df30524b5c44def3d924e77028b95b2b1c51b89.tar.gz
ext/flac/: Cast some size_t arguments to guint to avoid compiler warnings on 64-bit systems.
Original commit message from CVS: * ext/flac/gstflacdec.c (gst_flac_dec_read_stream): * ext/flac/gstflacenc.c (gst_flac_enc_write_callback): Cast some size_t arguments to guint to avoid compiler warnings on 64-bit systems.
-rw-r--r--ChangeLog7
-rw-r--r--ext/flac/gstflacdec.c2
-rw-r--r--ext/flac/gstflacenc.c5
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eef06997d..3e9d37fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-10 Jan Schmidt <jan.schmidt@sun.com>
+
+ * ext/flac/gstflacdec.c (gst_flac_dec_read_stream):
+ * ext/flac/gstflacenc.c (gst_flac_enc_write_callback):
+ Cast some size_t arguments to guint to avoid compiler
+ warnings on 64-bit systems.
+
2008-10-09 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_handle_src_event):
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index dd730b3d3..67981e989 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -982,7 +982,7 @@ gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder,
}
GST_LOG_OBJECT (dec, "feeding %u bytes to decoder (available=%u, bytes=%u)",
- len, gst_adapter_available (dec->adapter), *bytes);
+ len, gst_adapter_available (dec->adapter), (guint) * bytes);
memcpy (buffer, gst_adapter_peek (dec->adapter, len), len);
*bytes = len;
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 3f4a2a3f7..e5a7804bd 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -996,7 +996,8 @@ gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
/* we assume libflac passes us stuff neatly framed */
if (!flacenc->got_headers) {
if (samples == 0) {
- GST_DEBUG_OBJECT (flacenc, "Got header, queueing (%u bytes)", bytes);
+ GST_DEBUG_OBJECT (flacenc, "Got header, queueing (%u bytes)",
+ (guint) bytes);
flacenc->headers = g_list_append (flacenc->headers, outbuf);
/* note: it's important that we increase our byte offset */
goto out;
@@ -1011,7 +1012,7 @@ gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder,
GST_LOG ("Pushing buffer: ts=%" GST_TIME_FORMAT ", samples=%u, size=%u, "
"pos=%" G_GUINT64_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
- samples, bytes, flacenc->offset);
+ samples, (guint) bytes, flacenc->offset);
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (flacenc->srcpad));
ret = gst_pad_push (flacenc->srcpad, outbuf);