summaryrefslogtreecommitdiff
path: root/docs/design/part-events.txt
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2011-09-08 14:23:50 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2011-09-08 14:28:23 +0200
commit43538e2e75b4bdc5fc71a62b472a4b223472c059 (patch)
tree8fc77f478b9d15166c85c083e24d0ee0e6b890ad /docs/design/part-events.txt
parenta952de69dd7aa216dc7aaf5572ae17229574477a (diff)
parentd3cad28da936b037d877dc70c02286b81b680284 (diff)
Merge branch 'master' into 0.11
Conflicts: docs/design/draft-buffer2.txt docs/design/part-TODO.txt docs/design/part-block.txt docs/design/part-bufferlist.txt docs/design/part-caps.txt docs/design/part-element-transform.txt docs/design/part-events.txt docs/design/part-negotiation.txt gst/gstcaps.c gst/gstevent.h gst/gstghostpad.c gst/gstinterface.c gst/gstpad.c gst/gstpad.h gst/gstutils.c libs/gst/base/gstbasesink.c libs/gst/base/gstbasesrc.c libs/gst/base/gstbasetransform.c libs/gst/base/gsttypefindhelper.c plugins/elements/gstcapsfilter.c plugins/elements/gsttee.c tests/check/generic/sinks.c tools/gst-launch.1.in
Diffstat (limited to 'docs/design/part-events.txt')
-rw-r--r--docs/design/part-events.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/design/part-events.txt b/docs/design/part-events.txt
index 78f15c1149..319369823d 100644
--- a/docs/design/part-events.txt
+++ b/docs/design/part-events.txt
@@ -162,11 +162,11 @@ Before sending buffers, an element must send a SEGMENT event. An element is
free to refuse buffers if they were not preceeded by a SEGMENT event.
Elements that sync to the clock should store the SEGMENT start and end values
-and substract the start value from the buffer timestamp before comparing
+and subtract the start value from the buffer timestamp before comparing
it against the stream time (see part-clocks.txt).
An element is allowed to send out buffers with the SEGMENT start time already
-substracted from the timestamp. If it does so, it needs to send a corrected
+subtracted from the timestamp. If it does so, it needs to send a corrected
SEGMENT downstream, ie, one with start time 0.
A SEGMENT event should be generated as soon as possible in the pipeline and