diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-22 18:15:41 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-22 18:15:41 +0100 |
| commit | 7d29d7d0f6c2586fc87f26f1f975db9319ad3e12 (patch) | |
| tree | 743d0ace340657e6a6faa6f8a5283a1ffb86409b /gst/videomixer/videomixer2.c | |
| parent | 28f3824323a50db502f3238f21aa02f4807927f8 (diff) | |
Imported Upstream version 1.0.6
Diffstat (limited to 'gst/videomixer/videomixer2.c')
| -rw-r--r-- | gst/videomixer/videomixer2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 9f1aefca..1d14c5e2 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, @@ -1084,6 +1084,7 @@ gst_videomixer2_query_caps (GstPad * pad, GstObject * parent, GstQuery * query) } } gst_query_set_caps_result (query, caps); + gst_caps_unref (caps); return TRUE; } |