aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-05-16 00:31:31 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-05-16 00:41:39 +0200
commita28aa76ac83fbc84f0c00c20223ab96afb53cd6f (patch)
treea99b365a9731dc01ffe5f99a4f7cc5396ae928fc
parent6439ad495e2ce04dac3023a52a4b7158eb8c8b21 (diff)
downloadffmpeg-a28aa76ac83fbc84f0c00c20223ab96afb53cd6f.tar.gz
doc/filtering_design: fix typo negociation -> negotiation
-rw-r--r--doc/filter_design.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/filter_design.txt b/doc/filter_design.txt
index a19f3169e4..924057e97a 100644
--- a/doc/filter_design.txt
+++ b/doc/filter_design.txt
@@ -8,7 +8,7 @@ In this document, the word “frame” indicates either a video frame or a group
of audio samples, as stored in an AVFilterBuffer structure.
-Format negociation
+Format negotiation
==================
The query_formats method should set, for each input and each output links,
@@ -18,7 +18,7 @@ Format negociation
channel layout, sample format and sample packing.
The lists are not just lists, they are references to shared objects. When
- the negociation mechanism computes the intersection of the formats
+ the negotiation mechanism computes the intersection of the formats
supported at each ends of a link, all references to both lists are
replaced with a reference to the intersection. And when a single format is
eventually chosen for a link amongst the remaining list, again, all