mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 21:16:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/rtp/gstrtpvrawdepay.c
This commit is contained in:
Wim Taymans 2011-10-16 15:26:38 +02:00
commit ddd58a4035
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/videomixer/videomixer2.c
View file

@ -760,7 +760,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
if (buf == mixcol->queued) {
gst_buffer_unref (buf);
gst_buffer_replace (mixcol->queued, NULL);
gst_buffer_replace (&mixcol->queued, NULL);
} else {
gst_buffer_unref (buf);
buf = gst_collect_pads2_pop (mix->collect, &mixcol->collect);
@ -770,6 +770,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
} else if (start_time >= output_end_time) {
GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time));
gst_buffer_unref (buf);
eos = FALSE;
} else {
GST_DEBUG_OBJECT (pad, "Too old buffer -- dropping");