Revert "videomixer2: Take into account new segments"
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 9 May 2013 14:26:19 +0000 (16:26 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 9 May 2013 14:26:19 +0000 (16:26 +0200)
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

index f34eb2f..09a8218 100644 (file)
@@ -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: