diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-09-08 14:23:50 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-09-08 14:28:23 +0200 |
| commit | 43538e2e75b4bdc5fc71a62b472a4b223472c059 (patch) | |
| tree | 8fc77f478b9d15166c85c083e24d0ee0e6b890ad /docs/design/part-caps.txt | |
| parent | a952de69dd7aa216dc7aaf5572ae17229574477a (diff) | |
| parent | d3cad28da936b037d877dc70c02286b81b680284 (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-caps.txt')
| -rw-r--r-- | docs/design/part-caps.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/design/part-caps.txt b/docs/design/part-caps.txt index ee4b5aa5a0..ac04b757b6 100644 --- a/docs/design/part-caps.txt +++ b/docs/design/part-caps.txt @@ -12,6 +12,6 @@ Caps are exposed on the element pads using the _get_caps() pad function. This function describes the possible types that the pad can handle or produce (see part-pads.txt and part-negotiation.txt). -Various methods exist to work with the media types such as substracting +Various methods exist to work with the media types such as subtracting or intersecting. |