diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gst/videomixer/videomixer.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-02-29 Michael Smith <msmith@fluendo.com> + + * gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers): + Don't call gst_object_sync_values() unless we have a valid timestamp. + 2008-02-28 David Schleef <ds@schleef.org> * gst/matroska/matroska-demux.c: diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 2d3baa77..7cbaf033 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -1031,8 +1031,9 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf) walk = g_slist_next (walk); if (mixcol->buffer != NULL) { - gst_object_sync_values (G_OBJECT (pad), - GST_BUFFER_TIMESTAMP (mixcol->buffer)); + if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (mixcol->buffer))) + gst_object_sync_values (G_OBJECT (pad), + GST_BUFFER_TIMESTAMP (mixcol->buffer)); gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (mixcol->buffer), pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha, GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height); |