summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2004-09-07 13:40:52 +0000
committerWim Taymans <wim.taymans@gmail.com>2004-09-07 13:40:52 +0000
commit53aaed648c48330aca96924666bde87003d2ab0b (patch)
tree016906bb10858022f446aebecee3e3ac1eec460f
parent2dcf08d1fed5ff685f0aa9c43849b91f98563c22 (diff)
downloadgst-plugins-bad-53aaed648c48330aca96924666bde87003d2ab0b.tar.gz
gst-plugins-bad-53aaed648c48330aca96924666bde87003d2ab0b.tar.bz2
gst-plugins-bad-53aaed648c48330aca96924666bde87003d2ab0b.zip
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.
-rw-r--r--ChangeLog5
m---------common0
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d9010bbf..6a079db1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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