diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst/videomixer/videomixer.c | 4 |
3 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2004-09-07 Wim Taymans <wim@fluendo.com> + + * gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers): + Copy timestamps from the master pad to the output buffers. + 2004-09-03 Thomas Vander Stichele <thomas at apestaart dot org> * ext/raw1394/gstdv1394src.c: diff --git a/common b/common -Subproject e258b347aa811ca7aa49e102ca3d576a91e4fb6 +Subproject 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 6cf4b17e..c268023e 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -991,6 +991,10 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf) pad->in_width, pad->in_height, pad->alpha, GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height); + if (pad == mix->master) { + GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (pad->buffer); + GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (pad->buffer); + } } } } |