Commit b9151a9c authored by Matthew Waters's avatar Matthew Waters Committed by Wim Taymans
Browse files

videomixer: fix eos timestamp check

fixes hang in videotestsrc num-buffers=20 ! videomixer ! fakesink

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=692935
parent 18ff57d6
...@@ -791,7 +791,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix, ...@@ -791,7 +791,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
} }
} else { } else {
if (mixcol->end_time != -1) { 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); gst_buffer_replace (&mixcol->buffer, NULL);
mixcol->start_time = mixcol->end_time = -1; mixcol->start_time = mixcol->end_time = -1;
if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol, if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment