summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/faad/gstfaad.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d67ad072..4f4b2217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-17 Edward Hervey <edward@fluendo.com>
+
+ * ext/faad/gstfaad.c: (gst_faad_chain):
+ There's no guarantee that caps was set to something, and if it did, the
+ function called to fill that variable actually sets the caps on the
+ sourcpad, so we call gst_pad_alloc_buffer_and_set_caps() using
+ GST_PAD_CAPS(faad->srcpad).
+
2006-05-13 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Young-Ho Cha <ganadist chollian net>
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 76d4a73c..8d86fc41 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -1261,8 +1261,8 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
/* note: info.samples is total samples, not per channel */
ret =
- gst_pad_alloc_buffer_and_set_caps (faad->srcpad, 0, bufsize, caps,
- &outbuf);
+ gst_pad_alloc_buffer_and_set_caps (faad->srcpad, 0, bufsize,
+ GST_PAD_CAPS (faad->srcpad), &outbuf);
if (ret != GST_FLOW_OK)
goto out;