From d11af7cd6b05c03989d1901fe1fa21f94ab45283 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Wed, 16 Jul 2014 16:57:35 +0200 Subject: [PATCH] aggregator: Reset flow_return *after* stopping the srcpad task. Otherwise it might be set in an already running aggregate function. --- gst-libs/gst/base/gstaggregator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst-libs/gst/base/gstaggregator.c b/gst-libs/gst/base/gstaggregator.c index 7eab8063a0..9274600882 100644 --- a/gst-libs/gst/base/gstaggregator.c +++ b/gst-libs/gst/base/gstaggregator.c @@ -587,8 +587,8 @@ _sink_event (GstAggregator * self, GstAggregatorPad * aggpad, GstEvent * event) TRUE, FALSE) == TRUE) { GST_DEBUG_OBJECT (self, "Flushing, pausing srcpad task"); - priv->flow_return = GST_FLOW_OK; _stop_srcpad_task (self, event); + priv->flow_return = GST_FLOW_OK; GST_INFO_OBJECT (self, "Getting STREAM_LOCK while seeking"); GST_PAD_STREAM_LOCK (self->srcpad);