diff options
author | Julien Moutte <julien@moutte.net> | 2008-06-23 16:13:40 +0000 |
---|---|---|
committer | Julien Moutte <julien@moutte.net> | 2008-06-23 16:13:40 +0000 |
commit | 75c5d2e4efe9b19c3e1033557c93c2db621bddd7 (patch) | |
tree | 5c172b14a1c1da65f98a6445e71a12e7d3307e84 | |
parent | b3ac90d9e88e0e3455b902084bd077fe7197d6a1 (diff) |
gst/matroska/matroska-demux.c: Fix buggy format strings in macros. (makes it build on OS X again...)
Original commit message from CVS:
2008-06-23 Julien Moutte <julien@fluendo.com>
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_read_track_encoding),
(gst_matroska_demux_parse_blockgroup_or_simpleblock): Fix buggy
format strings in macros. (makes it build on OS X again...)
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | gst/matroska/matroska-demux.c | 8 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2008-06-23 Julien Moutte <julien@fluendo.com> + + * gst/matroska/matroska-demux.c: + (gst_matroska_demux_read_track_encoding), + (gst_matroska_demux_parse_blockgroup_or_simpleblock): Fix buggy + format strings in macros. (makes it build on OS X again...) + 2008-06-20 Thomas Vander Stichele <thomas at apestaart dot org> * gst/rtp/gstrtptheorapay.c: diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index d18a3594..30e69f8d 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -434,12 +434,12 @@ gst_matroska_demux_read_track_encoding (GstMatroskaDemux * demux, break; if (num > 7 && num == 0) { - GST_ERROR_OBJECT (demux, "Invalid ContentEncodingScope %", + GST_ERROR_OBJECT (demux, "Invalid ContentEncodingScope %" G_GUINT64_FORMAT, num); ret = GST_FLOW_ERROR; break; } else if (num & 0x4) { - GST_ERROR_OBJECT (demux, "Unsupported ContentEncodingScope %", + GST_ERROR_OBJECT (demux, "Unsupported ContentEncodingScope %" G_GUINT64_FORMAT, num); ret = GST_FLOW_ERROR; } @@ -3840,14 +3840,14 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, case GST_MATROSKA_ID_BLOCKDURATION:{ ret = gst_ebml_read_uint (ebml, &id, &block_duration); GST_DEBUG_OBJECT (demux, "BlockDuration: %" G_GUINT64_FORMAT, - &block_duration); + block_duration); break; } case GST_MATROSKA_ID_REFERENCEBLOCK:{ ret = gst_ebml_read_sint (ebml, &id, &referenceblock); GST_DEBUG_OBJECT (demux, "ReferenceBlock: %" G_GINT64_FORMAT, - &referenceblock); + referenceblock); break; } |