From 86700041a847f3e683adf237c5ea43f4548bb7db Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 29 Feb 2008 12:35:24 +0000 Subject: [PATCH] gst/videomixer/videomixer.c: Don't call gst_object_sync_values() unless we have a valid timestamp. Original commit message from CVS: * gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers): Don't call gst_object_sync_values() unless we have a valid timestamp. --- ChangeLog | 5 +++++ gst/videomixer/videomixer.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d779be2..e35107e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-29 Michael Smith + + * 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 * gst/matroska/matroska-demux.c: diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 2d3baa7..7cbaf03 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); -- 2.7.4