From 4243714301e24e2f79bacb30f76e1040d1b369fa Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Tue, 11 Jun 2013 19:22:20 +0200 Subject: [PATCH] videomixer: add mix->segment.start to output_end_time When the segment start is not 0, this created a situation where the output_end_time is inferior to output_start_time, and the duration of the next buffer ended up underflowing. https://bugzilla.gnome.org/show_bug.cgi?id=701385 --- gst/videomixer/videomixer2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index 78034b3215..95e7d84f35 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -1013,7 +1013,7 @@ gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix) output_end_time = mix->ts_offset + gst_util_uint64_scale (mix->nframes + 1, GST_SECOND * GST_VIDEO_INFO_FPS_D (&mix->info), - GST_VIDEO_INFO_FPS_N (&mix->info)); + GST_VIDEO_INFO_FPS_N (&mix->info)) + mix->segment.start; if (mix->segment.stop != -1) output_end_time = MIN (output_end_time, mix->segment.stop);