diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2013-01-31 22:55:18 +1100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2013-01-31 16:45:38 +0100 |
| commit | b9151a9c28b9add95eaa148e82fccd6cff8c2991 (patch) | |
| tree | e877edea74c967d7b12bf8a0d0d7c56a8afef5a1 | |
| parent | 18ff57d6b31f81a147dff105bd2808fcbc463a0e (diff) | |
videomixer: fix eos timestamp check
fixes hang in videotestsrc num-buffers=20 ! videomixer ! fakesink
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=692935
| -rw-r--r-- | gst/videomixer/videomixer2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 30931fc78..9ea4ba5b2 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, |