Attachment #290255 for bug #387717

View | Details | Raw Unified | Return to bug 387717
Collapse All | Expand All

Lines 770-775 gst_videomixer2_fill_queues (GstVideoMixer2 * mix, Link Here

(-)a/gst/videomixer/videomixer2.c (+1 lines)
770	} else if (start_time >= output_end_time) {	770	} else if (start_time >= output_end_time) {
771	GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT,	771	GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT,
772	GST_TIME_ARGS (start_time));	772	GST_TIME_ARGS (start_time));
		773	gst_buffer_unref (buf);
773	eos = FALSE;	774	eos = FALSE;
774	} else {	775	} else {
775	GST_DEBUG_OBJECT (pad, "Too old buffer -- dropping");	776	GST_DEBUG_OBJECT (pad, "Too old buffer -- dropping");

Lines 760-766 gst_videomixer2_fill_queues (GstVideoMixer2 * mix, Link Here

(-)a/gst/videomixer/videomixer2.c (-1 / +1 lines)
760		760
761	if (buf == mixcol->queued) {	761	if (buf == mixcol->queued) {
762	gst_buffer_unref (buf);	762	gst_buffer_unref (buf);
763	gst_buffer_replace (mixcol->queued, NULL);	763	gst_buffer_replace (&mixcol->queued, NULL);
764	} else {	764	} else {
765	gst_buffer_unref (buf);	765	gst_buffer_unref (buf);
766	buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);	766	buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);

Return to bug 387717