summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/mpegdemux/gstmpegdemux.c2
-rw-r--r--gst/mpegdemux/gstmpegtsdemux.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a7f44ed..f460442f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-02 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_parse_pack_start):
+ * gst/mpegdemux/gstmpegtsdemux.c: (gst_fluts_demux_data_cb):
+ Fix build on macosx.
+
2008-09-02 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* configure.ac:
diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index a4b62d3c..4b30b00d 100644
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -1037,7 +1037,7 @@ gst_flups_demux_parse_pack_start (GstFluPSDemux * demux)
/* We keep the offset of this scr */
demux->last_scr_offset = demux->adapter_offset + 12;
- GST_DEBUG_OBJECT (demux, "SCR: 0x%08x SCRE: 0x%08x", scr, scr_ext);
+ GST_DEBUG_OBJECT (demux, "SCR: 0x%08llx SCRE: 0x%08x", scr, scr_ext);
if (scr_ext) {
scr = (scr * 300 + scr_ext % 300) / 300;
diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
index cbd7cc3a..f9cb473e 100644
--- a/gst/mpegdemux/gstmpegtsdemux.c
+++ b/gst/mpegdemux/gstmpegtsdemux.c
@@ -939,7 +939,7 @@ gst_fluts_demux_data_cb (GstPESFilter * filter, gboolean first,
}
GST_LOG_OBJECT (demux, "setting PTS to (%" G_GUINT64_FORMAT ") time: %"
- GST_TIME_FORMAT " on buffer 0x%x first buffer: %d base_time: %"
+ GST_TIME_FORMAT " on buffer %p first buffer: %d base_time: %"
GST_TIME_FORMAT, pts, GST_TIME_ARGS (time), buffer, first,
GST_TIME_ARGS (stream->base_time));