From d47f97b0d41a5dd6a32a70da0139a1698c97ebe3 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 17 May 2006 09:15:55 +0000 Subject: ext/faad/gstfaad.c: There's no guarantee that caps was set to something, and if it did, the function called to fill t... Original commit message from CVS: * 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). --- ChangeLog | 8 ++++++++ ext/faad/gstfaad.c | 4 ++-- 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 + + * 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 Patch by: Young-Ho Cha 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; -- cgit v1.2.1