summaryrefslogtreecommitdiff
path: root/gst/videomixer
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu.duponchelle@epitech.eu>2013-09-04 00:27:50 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-09-04 11:09:04 +0200
commitb68f419b6f94db059a5fc06b2e7db65f16773eae (patch)
tree782c9f0e3584131e811b60553add992c79f65bf9 /gst/videomixer
parent349afc633a8d735eecf7e1b4744e6e82bf6f4a81 (diff)
videomixer: Don't set EOS to FALSE when the collectpad *is* EOS
https://bugzilla.gnome.org/show_bug.cgi?id=707238
Diffstat (limited to 'gst/videomixer')
-rw-r--r--gst/videomixer/videomixer2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index 1fe431949..c60759f81 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -802,7 +802,8 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol,
GST_COLLECT_PADS_STATE_EOS))
need_more_data = TRUE;
- } else {
+ } else if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol,
+ GST_COLLECT_PADS_STATE_EOS)) {
eos = FALSE;
}
}