aboutsummaryrefslogtreecommitdiff
path: root/gst/videomixer/videomixer2.c
diff options
context:
space:
mode:
Diffstat (limited to 'gst/videomixer/videomixer2.c')
-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 f87f4b76..418005ed 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -1246,8 +1246,8 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix)
if (output_end_time >= mix->segment.stop) {
GST_DEBUG_OBJECT (mix, "Segment done");
- GST_VIDEO_MIXER2_UNLOCK (mix);
if (!(mix->segment.flags & GST_SEGMENT_FLAG_SEGMENT)) {
+ GST_VIDEO_MIXER2_UNLOCK (mix);
gst_pad_push_event (mix->srcpad, gst_event_new_eos ());
ret = GST_FLOW_EOS;
@@ -1917,6 +1917,7 @@ gst_videomixer2_sink_event (GstCollectPads * pads, GstCollectData * cdata,
gst_event_copy_segment (event, &seg);
g_assert (seg.format == GST_FORMAT_TIME);
+ gst_videomixer2_reset_qos (mix);
break;
}
case GST_EVENT_FLUSH_STOP: