aggregator: Reset flow_return *after* stopping the srcpad task.
authorMathieu Duponchelle <mathieu.duponchelle@opencreed.com>
Wed, 16 Jul 2014 14:57:35 +0000 (16:57 +0200)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 2 Dec 2017 15:10:25 +0000 (15:10 +0000)
Otherwise it might be set in an already running aggregate function.

libs/gst/base/gstaggregator.c

index 7eab806..9274600 100644 (file)
@@ -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);