diff options
| author | Michael Smith <msmith@xiph.org> | 2008-02-29 12:35:24 +0000 |
|---|---|---|
| committer | Michael Smith <msmith@xiph.org> | 2008-02-29 12:35:24 +0000 |
| commit | 86700041a847f3e683adf237c5ea43f4548bb7db (patch) | |
| tree | 727d1ce07bda970a7f0a637b27e835d04b63f7ae /gst/videomixer | |
| parent | a2104e099424d9f00ad7f0df0671ae820e499d0f (diff) | |
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.
Diffstat (limited to 'gst/videomixer')
| -rw-r--r-- | gst/videomixer/videomixer.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |