diff options
| author | Mathieu Duponchelle <mathieu.duponchelle@opencreed.com> | 2014-07-16 16:57:35 +0200 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2014-07-16 17:52:35 +0200 |
| commit | d11af7cd6b05c03989d1901fe1fa21f94ab45283 (patch) | |
| tree | f4b4d5a6dba365f989536d152e4c486e58f80f95 | |
| parent | 619237c0d0dce7425cc3e5b9e34ee22219dcdd02 (diff) | |
| download | gstreamer-plugins-bad-d11af7cd6b05c03989d1901fe1fa21f94ab45283.tar.gz | |
aggregator: Reset flow_return *after* stopping the srcpad task.
Otherwise it might be set in an already running aggregate function.
| -rw-r--r-- | gst-libs/gst/base/gstaggregator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst-libs/gst/base/gstaggregator.c b/gst-libs/gst/base/gstaggregator.c index 7eab8063a..927460088 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); |