mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "videomixer2: Take into account new segments"

Browse source 
This reverts commit 84ae670ab4.

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.
This commit is contained in:
Sebastian Dröge 2013-05-09 16:26:19 +02:00
parent 84ae670ab4
commit 3110b7cc31
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/videomixer/videomixer2.c
View 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: