summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/mpegaudioparse/gstxingmux.c6
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a3965776..53701e2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-11 Julien Moutte <julien@fluendo.com>
+
+ * gst/mpegaudioparse/gstxingmux.c: (generate_xing_header): Fix
+ argument formats.
+
2008-04-06 Sebastian Dröge <slomo@circular-chaos.org>
Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
diff --git a/common b/common
-Subproject fda6da5f2b9b000f7e1df8ffb44a6185ffd9799
+Subproject d3ace35f57dd196a3e83a0a48f1350ca32db8e3
diff --git a/gst/mpegaudioparse/gstxingmux.c b/gst/mpegaudioparse/gstxingmux.c
index 49454f08..f85f58cb 100644
--- a/gst/mpegaudioparse/gstxingmux.c
+++ b/gst/mpegaudioparse/gstxingmux.c
@@ -345,8 +345,8 @@ generate_xing_header (GstXingMux * xing)
guint32 nbytes;
if (byte_count > G_MAXUINT32) {
- GST_DEBUG ("Too large stream: %" G_GINT64_FORMAT " > %" G_GINT64_FORMAT
- " bytes", byte_count, G_MAXUINT32);
+ GST_DEBUG ("Too large stream: %" G_GINT64_FORMAT " > %u bytes",
+ byte_count, G_MAXUINT32);
} else {
nbytes = byte_count;
GST_DEBUG ("Setting number of bytes to %u", nbytes);
@@ -371,7 +371,7 @@ generate_xing_header (GstXingMux * xing)
while ((entry->timestamp * 100) / duration >= percent) {
byte = (entry->byte * 256) / byte_count;
- GST_DEBUG (" %d %% -- %d 1/256", percent, byte);
+ GST_DEBUG (" %d %% -- %" G_GINT64_FORMAT " 1/256", percent, byte);
*data = byte;
data++;
percent++;