From 3110b7cc3195f347d7dcc22949c01b4316d70819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 9 May 2013 16:26:19 +0200 Subject: [PATCH] Revert "videomixer2: Take into account new segments" This reverts commit 84ae670ab40b258a10e1e21471e6dc9d786bf086. Actually this is not how it is supposed to work. videomixer creates a [0,-1] segment and then puts frames of the different streams there based on their running times in their own segments. --- gst/videomixer/videomixer2.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index f34eb2faac..09a8218f87 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -1703,11 +1703,10 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata, break; } case GST_EVENT_SEGMENT:{ - gst_event_copy_segment (event, &mix->segment); + GstSegment seg; + gst_event_copy_segment (event, &seg); - mix->newseg_pending = TRUE; - - g_assert (mix->segment.format == GST_FORMAT_TIME); + g_assert (seg.format == GST_FORMAT_TIME); break; } case GST_EVENT_FLUSH_STOP: