From e99b5f24e9dcd68e0b2e0f8047bab8ba5a55893a Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 2 May 2006 17:17:22 +0000 Subject: [PATCH] libs/gst/base/gstcollectpads.c: back out the newsegment handling change, see #340060 for ongoing discussion Original commit message from CVS: * libs/gst/base/gstcollectpads.c: (gst_collect_pads_event): back out the newsegment handling change, see #340060 for ongoing discussion --- ChangeLog | 6 ++++++ libs/gst/base/gstcollectpads.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce269d4cec..5a0d9bd8d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-02 Stefan Kost + + * libs/gst/base/gstcollectpads.c: (gst_collect_pads_event): + back out the newsegment handling change, see #340060 for ongoing + discussion + 2006-04-30 Tim-Philipp Müller * tools/gst-run.c: (get_candidates), (main): diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index ff40dbbd87..8dde27edcc 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -741,8 +741,8 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event) data->abidata.ABI.new_segment = TRUE; - /* forward to src-pad, sink-elements like to get the event */ - gst_pad_event_default (pad, event); + /* For now we eat this event */ + gst_event_unref (event); /* FIXME: collect-pads based elements need to create their own newsegment event (and only one really) (a) make the segment part of the GstCollectData structure of each pad, @@ -751,6 +751,7 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event) catch the newsegment event and then pass it on to the original gstcollectpads event function (that's what avimux does for something IIRC) + see #340060 */ return TRUE; }