Commit ddd58a40 authored by Wim Taymans's avatar Wim Taymans

Merge branch 'master' into 0.11

Conflicts:
	gst/rtp/gstrtpvrawdepay.c
parents be3156dd cc7aeb3f
...@@ -760,7 +760,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix, ...@@ -760,7 +760,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
if (buf == mixcol->queued) { if (buf == mixcol->queued) {
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_buffer_replace (mixcol->queued, NULL); gst_buffer_replace (&mixcol->queued, NULL);
} else { } else {
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect); buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
...@@ -770,6 +770,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix, ...@@ -770,6 +770,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
} else if (start_time >= output_end_time) { } else if (start_time >= output_end_time) {
GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time)); GST_TIME_ARGS (start_time));
gst_buffer_unref (buf);
eos = FALSE; eos = FALSE;
} else { } else {
GST_DEBUG_OBJECT (pad, "Too old buffer -- dropping"); GST_DEBUG_OBJECT (pad, "Too old buffer -- dropping");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment