From 9f17094cf33fa57c290408d4ded8569ce0e0e03e Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 31 Jul 2020 16:02:03 +1000 Subject: [PATCH] aggregator: don't fail all sink pads when a caps event fails negotiation If one pad returns not-negotiated from a caps event, then all other sink pads were returning not-negotiated. In our case, we can't reliably easily fail at all so just remove that code. Part-of: --- libs/gst/base/gstaggregator.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c index 3f6775bb33..5dab9fa7b7 100644 --- a/libs/gst/base/gstaggregator.c +++ b/libs/gst/base/gstaggregator.c @@ -920,8 +920,6 @@ gst_aggregator_do_events_and_queries (GstElement * self, GstPad * epad, PAD_LOCK (pad); if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS) { pad->priv->negotiated = ret; - if (!ret) - pad->priv->flow_return = data->flow_ret = GST_FLOW_NOT_NEGOTIATED; } if (g_queue_peek_tail (&pad->priv->data) == event) gst_event_unref (g_queue_pop_tail (&pad->priv->data));