mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 07:08:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/videomixer/videomixer.c: Remove bogus check.

Browse source 
Original commit message from CVS:
* gst/videomixer/videomixer.c: (gst_videomixer_fill_queues),
(gst_videomixer_blend_buffers), (gst_videomixer_update_queues):
Remove bogus check.
This commit is contained in:
Wim Taymans 2008-06-10 17:20:45 +00:00
parent 515b32d5aa
commit 06fa431cef
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-06-10 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/videomixer/videomixer.c: (gst_videomixer_fill_queues),
(gst_videomixer_blend_buffers), (gst_videomixer_update_queues):
Remove bogus check.
2008-06-10 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/videomixer/videomixer.c: (gst_videomixer_fill_queues),

5
gst/videomixer/videomixer.c
View file

@ -1378,6 +1378,7 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
} else {
interval = GST_SECOND * mix->fps_d / mix->fps_n;
}
GST_DEBUG_OBJECT (mix, "set interval to %" G_GUINT64_FORMAT, interval);
}
walk = mix->sinkpads;
@ -1388,9 +1389,9 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
walk = g_slist_next (walk);
if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (pad->queued)) {
if (mixcol->buffer != NULL) {
pad->queued -= interval;
GST_DEBUG_OBJECT (pad, "queued now %lld", pad->queued);
GST_DEBUG_OBJECT (pad, "queued now %" G_GINT64_FORMAT, pad->queued);
if (pad->queued <= 0) {
GST_DEBUG ("unreffing buffer");
gst_buffer_unref (mixcol->buffer);