summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-01-11 16:59:40 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-01-11 16:59:40 +0000
commit1e364d04f5b9d1085ae469a7308ce95d157cf878 (patch)
tree224c2b886718e61b4fa658c82811df00dffcecbb
parent5c1a7a9260add782b8ab430cd8102847c3e6b81a (diff)
gst/: Set correct caps on outgoing pulled buffers, or things blow up after recent core changes.
Original commit message from CVS: * gst/apetag/gsttagdemux.c: (gst_tag_demux_read_range): * gst/id3demux/gstid3demux.c: (gst_id3demux_read_range): Set correct caps on outgoing pulled buffers, or things blow up after recent core changes.
-rw-r--r--ChangeLog7
-rw-r--r--gst/apetag/gsttagdemux.c2
-rw-r--r--gst/id3demux/gstid3demux.c2
3 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 99f4b0c8..e1d18a53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-11 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/apetag/gsttagdemux.c: (gst_tag_demux_read_range):
+ * gst/id3demux/gstid3demux.c: (gst_id3demux_read_range):
+ Set correct caps on outgoing pulled buffers, or things blow up
+ after recent core changes.
+
2007-01-11 Wim Taymans <wim@fluendo.com>
Based on patch by: Jonas Holmberg <jonas dot holmberg at axis dot com>
diff --git a/gst/apetag/gsttagdemux.c b/gst/apetag/gsttagdemux.c
index 1615f3f3..9baaebbe 100644
--- a/gst/apetag/gsttagdemux.c
+++ b/gst/apetag/gsttagdemux.c
@@ -1197,6 +1197,8 @@ gst_tag_demux_read_range (GstTagDemux * demux,
/* this should only happen in streaming mode */
g_assert (*buffer != NULL);
+
+ gst_buffer_set_caps (*buffer, demux->priv->src_caps);
}
return ret;
diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c
index ef7a4c19..469514f9 100644
--- a/gst/id3demux/gstid3demux.c
+++ b/gst/id3demux/gstid3demux.c
@@ -977,6 +977,8 @@ gst_id3demux_read_range (GstID3Demux * id3demux,
/* this should only happen in streaming mode */
g_assert (*buffer != NULL);
+
+ gst_buffer_set_caps (*buffer, id3demux->src_caps);
}
return ret;