From b9151a9c28b9add95eaa148e82fccd6cff8c2991 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 31 Jan 2013 22:55:18 +1100 Subject: [PATCH] videomixer: fix eos timestamp check fixes hang in videotestsrc num-buffers=20 ! videomixer ! fakesink Fixes https://bugzilla.gnome.org/show_bug.cgi?id=692935 --- gst/videomixer/videomixer2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 30931fc..9ea4ba5 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -791,7 +791,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix, } } else { if (mixcol->end_time != -1) { - if (mixcol->end_time < output_start_time) { + if (mixcol->end_time <= output_start_time) { gst_buffer_replace (&mixcol->buffer, NULL); mixcol->start_time = mixcol->end_time = -1; if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol, -- 2.7.4