mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 10:11:08 +00:00
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.
This commit is contained in:
parent
24cf409da2
commit
658b2d7f85
3 changed files with 10 additions and 1 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:
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit e258b347aa811ca7aa49e102ca3d576a91e4fb62
|
||||
Subproject commit 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue