From 0e973bc4fc6ef9ccf0d0ffbfcd3583873c2304ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Sun, 21 May 2017 14:28:00 +0200 Subject: [PATCH] aggregator: Caps event always goes to the aggregate thread So no need to check it here. https://bugzilla.gnome.org/show_bug.cgi?id=782918 --- libs/gst/base/gstaggregator.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c index 1e5f5a1cc1..18eb6d9361 100644 --- a/libs/gst/base/gstaggregator.c +++ b/libs/gst/base/gstaggregator.c @@ -2606,12 +2606,10 @@ gst_aggregator_pad_event_func (GstPad * pad, GstObject * parent, } if (event) { - gboolean is_caps = (GST_EVENT_TYPE (event) == GST_EVENT_CAPS); - if (!klass->sink_event (self, aggpad, event)) { /* Copied from GstPad to convert boolean to a GstFlowReturn in * the event handling func */ - ret = is_caps ? GST_FLOW_NOT_NEGOTIATED : GST_FLOW_ERROR; + ret = GST_FLOW_ERROR; } }