diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2004-09-07 13:40:52 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2004-09-07 13:40:52 +0000 |
| commit | 658b2d7f8515a4214b65ce30f6285c853b2e9137 (patch) | |
| tree | 48fa57cf74a286d601531ddc24f9b2d0651f9f10 /gst/videomixer | |
| parent | 24cf409da20ec3196cf2e7acd3fef08047239344 (diff) | |
gst/videomixer/videomixer.c: Copy timestamps from the master pad to the output buffers.
Original commit message from CVS:
* gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers):
Copy timestamps from the master pad to the output buffers.
Diffstat (limited to 'gst/videomixer')
| -rw-r--r-- | gst/videomixer/videomixer.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); + } } } } |