summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <olivier.crete@collabora.com>2016-05-14 15:52:37 +0200
committerTim-Philipp Müller <tim@centricular.com>2017-12-02 15:10:27 +0000
commit687ac8e4d5a24bd99a388b08676c4a7ba876c09a (patch)
treea38d7c88869156e3793ca5d708e6d3dc304b3eee
parent2ce3234aa010c4b3f654f1967206d5aa87433f3a (diff)
aggregator: Always handle sync'ed events on output thread
Having all synchronized events always be handled on the output thread should make synchronization easier. https://bugzilla.gnome.org/show_bug.cgi?id=781673
-rw-r--r--libs/gst/base/gstaggregator.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c
index 1a95fc9c1..f38d92a93 100644
--- a/libs/gst/base/gstaggregator.c
+++ b/libs/gst/base/gstaggregator.c
@@ -2341,8 +2341,7 @@ gst_aggregator_pad_event_func (GstPad * pad, GstObject * parent,
GST_OBJECT_UNLOCK (aggpad);
}
- if (!gst_aggregator_pad_queue_is_empty (aggpad) &&
- GST_EVENT_TYPE (event) != GST_EVENT_FLUSH_STOP) {
+ if (GST_EVENT_TYPE (event) != GST_EVENT_FLUSH_STOP) {
GST_DEBUG_OBJECT (aggpad, "Store event in queue: %" GST_PTR_FORMAT,
event);
g_queue_push_head (&aggpad->priv->buffers, event);