summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-03-22 18:18:46 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-03-22 18:18:46 +0000
commit89c2fe05be4f6f6ca0a03020ce3179c4fff178db (patch)
treef494e15cf9471d5ff7f87dfc778f092f0751dea0
parent180aee532b53b406f2c00f71b766159c031495d4 (diff)
downloadgst-plugins-bad-89c2fe05be4f6f6ca0a03020ce3179c4fff178db.tar.gz
gst-plugins-bad-89c2fe05be4f6f6ca0a03020ce3179c4fff178db.tar.bz2
gst-plugins-bad-89c2fe05be4f6f6ca0a03020ce3179c4fff178db.zip
ext/soup/gstsouphttpsrc.c: Actually set the icy caps on our src pad if we have icecast data.
Original commit message from CVS: * ext/soup/gstsouphttpsrc.c: (gst_soup_http_src_chunk_allocator): Actually set the icy caps on our src pad if we have icecast data. Fixes bug #523854.
-rw-r--r--ChangeLog6
-rw-r--r--ext/soup/gstsouphttpsrc.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 62587eb8..09f6bd81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-22 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * ext/soup/gstsouphttpsrc.c: (gst_soup_http_src_chunk_allocator):
+ Actually set the icy caps on our src pad if we have icecast data.
+ Fixes bug #523854.
+
2008-03-21 Sebastian Dröge <slomo@circular-chaos.org>
* configure.ac:
diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c
index f5ba2501..6c43aab1 100644
--- a/ext/soup/gstsouphttpsrc.c
+++ b/ext/soup/gstsouphttpsrc.c
@@ -731,6 +731,7 @@ gst_soup_http_src_chunk_allocator (SoupMessage * msg, gsize max_len,
rc = gst_pad_alloc_buffer (GST_BASE_SRC_PAD (basesrc),
GST_BUFFER_OFFSET_NONE, length,
+ src->icy_caps ? src->icy_caps :
GST_PAD_CAPS (GST_BASE_SRC_PAD (basesrc)), &gstbuf);
if (G_UNLIKELY (rc != GST_FLOW_OK)) {
/* Failed to allocate buffer. Stall SoupSession and return error code