Commit 86700041 authored by Michael Smith's avatar Michael Smith
Browse files

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.
parent a2104e09
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> 2008-02-28 David Schleef <ds@schleef.org>
   
* gst/matroska/matroska-demux.c: * gst/matroska/matroska-demux.c:
......
...@@ -1031,8 +1031,9 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf) ...@@ -1031,8 +1031,9 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
walk = g_slist_next (walk); walk = g_slist_next (walk);
if (mixcol->buffer != NULL) { if (mixcol->buffer != NULL) {
gst_object_sync_values (G_OBJECT (pad), if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (mixcol->buffer)))
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), gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (mixcol->buffer),
pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha, pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha,
GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height); GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment