From: <bi...@ke...> - 2008-09-02 17:43:49
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: bilboed Date: Tue Sep 02 2008 17:43:57 UTC Log message: * gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_parse_pack_start): * gst/mpegdemux/gstmpegtsdemux.c: (gst_fluts_demux_data_cb): Fix build on macosx. Modified files: . : ChangeLog gst/mpegdemux : gstmpegdemux.c gstmpegtsdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3537&r2=1.3538 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegdemux.c.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegtsdemux.c.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3537 retrieving revision 1.3538 diff -u -d -r1.3537 -r1.3538 --- ChangeLog 2 Sep 2008 12:04:28 -0000 1.3537 +++ ChangeLog 2 Sep 2008 17:43:41 -0000 1.3538 @@ -1,3 +1,9 @@ +2008-09-02 Edward Hervey <edw...@co...> + + * 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: Index: gstmpegdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegdemux.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gstmpegdemux.c 2 Sep 2008 12:04:31 -0000 1.1 +++ gstmpegdemux.c 2 Sep 2008 17:43:42 -0000 1.2 @@ -1037,7 +1037,7 @@ /* 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; Index: gstmpegtsdemux.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegtsdemux.c,v --- gstmpegtsdemux.c 2 Sep 2008 12:04:31 -0000 1.1 +++ gstmpegtsdemux.c 2 Sep 2008 17:43:42 -0000 1.2 @@ -939,7 +939,7 @@ } 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)); |