Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet be>
* gst/videomixer/videomixer.c: (gst_videomixer_update_queues):
Fix videomixer so that it can handle any combination of framerates.
Fixes #367221.
+2006-10-30 Wim Taymans <wim@fluendo.com>
+
+ Patch by: Mark Nauwelaerts <manauw at skynet be>
+
+ * gst/videomixer/videomixer.c: (gst_videomixer_update_queues):
+ Fix videomixer so that it can handle any combination of framerates.
+ Fixes #367221.
+
2006-10-28 Wim Taymans <wim@fluendo.com>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),
{
GstPad parent; /* subclass the pad */
- guint64 queued;
+ gint64 queued;
guint in_width, in_height;
gint fps_n;
if (mixcol->buffer != NULL && GST_CLOCK_TIME_IS_VALID (pad->queued)) {
pad->queued -= interval;
GST_DEBUG_OBJECT (pad, "queued now %lld", pad->queued);
- if (pad->queued == 0) {
+ if (pad->queued <= 0) {
GST_DEBUG ("unreffing buffer");
gst_buffer_unref (mixcol->buffer);
mixcol->buffer = NULL;