mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Reset flow_return *after* stopping the srcpad task.

Browse source 
Otherwise it might be set in an already running aggregate function.
This commit is contained in:
Mathieu Duponchelle 2014-07-16 16:57:35 +02:00 committed by Tim-Philipp Müller
parent e3075ed3ef
commit 5ef53b8a29
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/gst/base/gstaggregator.c
View file

@ -587,8 +587,8 @@ _sink_event (GstAggregator * self, GstAggregatorPad * aggpad, GstEvent * event)
TRUE, FALSE) == TRUE) { TRUE, FALSE) == TRUE) {
GST_DEBUG_OBJECT (self, "Flushing, pausing srcpad task"); GST_DEBUG_OBJECT (self, "Flushing, pausing srcpad task");
priv->flow_return = GST_FLOW_OK;
_stop_srcpad_task (self, event); _stop_srcpad_task (self, event);
priv->flow_return = GST_FLOW_OK;
GST_INFO_OBJECT (self, "Getting STREAM_LOCK while seeking"); GST_INFO_OBJECT (self, "Getting STREAM_LOCK while seeking");
GST_PAD_STREAM_LOCK (self->srcpad); GST_PAD_STREAM_LOCK (self->srcpad);