summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-11-21 14:08:45 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-11-21 14:08:45 +0000
commitef6f48e05c6f573ea95c45cbfdb4e57d065066aa (patch)
tree01ab58b454c3027c449985883a599020eebaa9e0
parent7cd253d5e176f1763c4c1d0f9eb745217012738c (diff)
gst/: Update for GST_FOURCC_FORMAT API change.
Original commit message from CVS: * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_add_video_stream): * gst/realmedia/rmdemux.c: (gst_rmdemux_chain), (gst_rmdemux_add_stream), (gst_rmdemux_parse_mdpr): Update for GST_FOURCC_FORMAT API change.
-rw-r--r--ChangeLog7
-rw-r--r--gst/asfdemux/gstasfdemux.c2
-rw-r--r--gst/realmedia/rmdemux.c8
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bbbcdf7b..66e55ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-21 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_add_video_stream):
+ * gst/realmedia/rmdemux.c: (gst_rmdemux_chain),
+ (gst_rmdemux_add_stream), (gst_rmdemux_parse_mdpr):
+ Update for GST_FOURCC_FORMAT API change.
+
2005-11-21 Edward Hervey <edward@fluendo.com>
* gst/dvdlpcmdec/gstdvdlpcmdec.c: (gst_dvdlpcmdec_chain_raw):
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 9315e308..9372b7a7 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1818,7 +1818,7 @@ gst_asf_demux_add_video_stream (GstASFDemux * asf_demux,
g_free (codec_name);
if (extradata)
gst_buffer_unref (extradata);
- GST_INFO ("Adding video stream %u codec " GST_FOURCC_FORMAT " (0x%08x)",
+ GST_INFO ("Adding video stream %u codec %" GST_FOURCC_FORMAT " (0x%08x)",
asf_demux->num_video_streams, GST_FOURCC_ARGS (video->tag), video->tag);
asf_demux->num_video_streams++;
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index 471c0422..58cefd9e 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -932,7 +932,7 @@ gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer)
break;
}
- GST_LOG_OBJECT (rmdemux, "header found with object_id="
+ GST_LOG_OBJECT (rmdemux, "header found with object_id=%"
GST_FOURCC_FORMAT
" size=%08x object_version=%d",
GST_FOURCC_ARGS (rmdemux->object_id), rmdemux->size,
@@ -970,7 +970,7 @@ gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer)
if (gst_adapter_available (rmdemux->adapter) < rmdemux->size)
goto unlock;
- GST_WARNING_OBJECT (rmdemux, "Unknown object_id " GST_FOURCC_FORMAT,
+ GST_WARNING_OBJECT (rmdemux, "Unknown object_id %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (rmdemux->object_id));
gst_adapter_flush (rmdemux->adapter, rmdemux->size);
@@ -1297,7 +1297,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream)
default:
GST_WARNING_OBJECT (rmdemux,
- "Unknown audio FOURCC code \"" GST_FOURCC_FORMAT "\"",
+ "Unknown audio FOURCC code \"%" GST_FOURCC_FORMAT "\"",
stream->fourcc);
break;
}
@@ -1534,7 +1534,7 @@ gst_rmdemux_parse_mdpr (GstRMDemux * rmdemux, const void *data, int length)
((double) RMDEMUX_GUINT16_GET (data + offset + 24) / 65536.0);
GST_DEBUG_OBJECT (rmdemux,
- "Video stream with fourcc=" GST_FOURCC_FORMAT
+ "Video stream with fourcc=%" GST_FOURCC_FORMAT
" width=%d height=%d rate=%d frame_rate=%f subformat=%x format=%x extra_data_size=%d",
GST_FOURCC_ARGS (stream->fourcc), stream->width, stream->height,
stream->rate, stream->frame_rate, stream->subformat, stream->format,