summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-04-06 12:33:50 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2012-04-06 13:44:05 +0200
commit88c4234fa2d89c59b8cadb9ca2b04d67069899f4 (patch)
treecad86af4a665c542c5aa2bc6d438f662e3708688
parent60ce27cf3acce081f263792cf4d6edcd8f7c9793 (diff)
queue2: correctly forward flush events
We need to forward the flush events when the srcpad is in push mode, which can also happen when using a ringbuffer and when downstream did not activate in pull mode.
-rw-r--r--plugins/elements/gstqueue2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 02fd10a1b..0bda2e780 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -2139,7 +2139,7 @@ gst_queue2_handle_sink_event (GstPad * pad, GstEvent * event)
case GST_EVENT_FLUSH_START:
{
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush start event");
- if (QUEUE_IS_USING_QUEUE (queue)) {
+ if (queue->srcpad->mode == GST_ACTIVATE_PUSH) {
/* forward event */
gst_pad_push_event (queue->srcpad, event);
@@ -2171,7 +2171,7 @@ gst_queue2_handle_sink_event (GstPad * pad, GstEvent * event)
{
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "received flush stop event");
- if (QUEUE_IS_USING_QUEUE (queue)) {
+ if (queue->srcpad->mode == GST_ACTIVATE_PUSH) {
/* forward event */
gst_pad_push_event (queue->srcpad, event);