summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2014-07-10 13:15:55 +0200
committerThibault Saunier <tsaunier@gnome.org>2014-07-16 17:52:30 +0200
commitd9385687fb95ec0f96208f3f20f6d268d5b30e2c (patch)
tree9ada3b77b29b936cf4f33aab4acd703e9b196e88
parent9233c6ac6974120f9d1ea2e1fc49aa6a7801255f (diff)
downloadgstreamer-plugins-bad-d9385687fb95ec0f96208f3f20f6d268d5b30e2c.tar.gz
aggregator: Do not forget to reset the flow return when stoping
Setting it to FLUSHING when the element is not started, and to OK when it starts.
-rw-r--r--gst-libs/gst/base/gstaggregator.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gst-libs/gst/base/gstaggregator.c b/gst-libs/gst/base/gstaggregator.c
index 93a8033bb..c2d00adde 100644
--- a/gst-libs/gst/base/gstaggregator.c
+++ b/gst-libs/gst/base/gstaggregator.c
@@ -293,6 +293,7 @@ gst_aggregator_set_src_caps (GstAggregator * self, GstCaps * caps)
static void
_reset_flow_values (GstAggregator * self)
{
+ self->priv->flow_return = GST_FLOW_FLUSHING;
self->priv->send_stream_start = TRUE;
self->priv->send_segment = TRUE;
gst_segment_init (&self->segment, GST_FORMAT_TIME);
@@ -460,6 +461,7 @@ _start (GstAggregator * self)
self->priv->send_segment = TRUE;
self->priv->send_eos = TRUE;
self->priv->srccaps = NULL;
+ self->priv->flow_return = GST_FLOW_OK;
return TRUE;
}