From 01cc493944d1c0036d80243bea4d63ea79c33013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 12 Jun 2013 18:23:46 +0200 Subject: [PATCH] Revert "videomixer: When all sinkpads are eos, update output segment stop and forward it" This reverts commit 2d3910fc7901b5f29e16c0fdd4e9067a6d7f66fe. It's not solving any problem and instead causes code to fall apart. https://bugzilla.gnome.org/show_bug.cgi?id=701519 --- gst/videomixer/videomixer2.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index ae850978a6..90f9196beb 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -1024,11 +1024,8 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix) ret = GST_FLOW_OK; goto done; } else if (res == -1) { - GST_DEBUG_OBJECT (mix, "All sinkpads are EOS -- forwarding"); - - mix->segment.stop = output_end_time; GST_VIDEO_MIXER2_UNLOCK (mix); - gst_pad_push_event (mix->srcpad, gst_event_new_segment (&mix->segment)); + GST_DEBUG_OBJECT (mix, "All sinkpads are EOS -- forwarding"); gst_pad_push_event (mix->srcpad, gst_event_new_eos ()); ret = GST_FLOW_EOS; goto done_unlocked;