From 0500807b557cd1744b3df612d18e21c86d5a0c88 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Tue, 23 May 2017 00:53:23 +0200
Subject: [PATCH] aggregator: Set flow to FLUSHING on pad stop

Fixes a rare race where the pad is being stopped while doing a query.
---
 libs/gst/base/gstaggregator.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c
index ec4be92..2afa3c3 100644
--- a/libs/gst/base/gstaggregator.c
+++ b/libs/gst/base/gstaggregator.c
@@ -1493,7 +1493,9 @@ gst_aggregator_stop_pad (GstAggregator * self, GstAggregatorPad * pad,
   gst_aggregator_pad_flush (pad, self);
 
   PAD_LOCK (pad);
+  pad->priv->flow_return = GST_FLOW_FLUSHING;
   pad->priv->negotiated = FALSE;
+  PAD_BROADCAST_EVENT (pad);
   PAD_UNLOCK (pad);
 
   return TRUE;
-- 
2.7.4