diff options
| author | Mark Nauwelaerts <manauw@skynet.be> | 2006-10-30 08:17:08 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-10-30 08:17:08 +0000 |
| commit | ccce64b2930a26d0e827846edde62386baceb9bf (patch) | |
| tree | cf4ab0db27f71c8c51a70ecfa1fed2f5ad00f40c | |
| parent | c152d13c6a050f54cbd3a61ce56475f464797372 (diff) | |
gst/videomixer/videomixer.c: Fix videomixer so that it can handle any combination of framerates.
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/videomixer/videomixer.c | 4 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +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), diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index b8d926b8..fe4eb7c3 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -125,7 +125,7 @@ struct _GstVideoMixerPad { GstPad parent; /* subclass the pad */ - guint64 queued; + gint64 queued; guint in_width, in_height; gint fps_n; @@ -1036,7 +1036,7 @@ gst_videomixer_update_queues (GstVideoMixer * mix) 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; |