aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-10-05 14:12:42 +0200
committerDiego Biurrun <diego@biurrun.de>2011-12-11 00:32:25 +0100
commitda9cea77e314dad2fbc615a76085a0c330741f92 (patch)
tree7ddbdbf1749d1ee7c66c83f76f66bd50367b246d /doc
parent2e87b4c51152e0241cae7f655d53920029a0e632 (diff)
downloadffmpeg-da9cea77e314dad2fbc615a76085a0c330741f92.tar.gz
Fix a bunch of common typos.
Diffstat (limited to 'doc')
-rw-r--r--doc/avconv.texi2
-rw-r--r--doc/avserver.texi2
-rw-r--r--doc/avtools-common-opts.texi2
-rw-r--r--doc/developer.texi4
-rw-r--r--doc/eval.texi4
-rw-r--r--doc/filters.texi18
-rw-r--r--doc/general.texi2
-rw-r--r--doc/protocols.texi6
-rw-r--r--doc/soc.txt2
9 files changed, 21 insertions, 21 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 9946aaa61c..84e0c1c4ef 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -29,7 +29,7 @@ rates and resize video on the fly with a high quality polyphase filter.
avconv reads from an arbitrary number of input "files" (which can be regular
files, pipes, network streams, grabbing devices, etc.), specified by the
@code{-i} option, and writes to an arbitrary number of output "files", which are
-specified by a plain output filename. Anything found on the commandline which
+specified by a plain output filename. Anything found on the command line which
cannot be interpreted as an option is considered to be an output filename.
Each input or output file can in principle contain any number of streams of
diff --git a/doc/avserver.texi b/doc/avserver.texi
index 351ee0da19..c023814e08 100644
--- a/doc/avserver.texi
+++ b/doc/avserver.texi
@@ -150,7 +150,7 @@ that only captures in stereo and also requires that one channel be flipped.
If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
starting avconv.
-@subsection The audio and video loose sync after a while.
+@subsection The audio and video lose sync after a while.
Yes, they do.
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 8892e9e431..372a6f2dc1 100644
--- a/doc/avtools-common-opts.texi
+++ b/doc/avtools-common-opts.texi
@@ -9,7 +9,7 @@ example 'KB', 'MiB', 'G' and 'B' as postfix.
Options which do not take arguments are boolean options, and set the
corresponding value to true. They can be set to false by prefixing
with "no" the option name, for example using "-nofoo" in the
-commandline will set to false the boolean option with name "foo".
+command line will set to false the boolean option with name "foo".
@section Stream specifiers
Some options are applied per-stream, e.g. bitrate or codec. Stream specifiers
diff --git a/doc/developer.texi b/doc/developer.texi
index dd31e3725b..e484520413 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -49,7 +49,7 @@ mailing list.
The code is written in K&R C style. That means the following:
@itemize @bullet
@item
-The control statements are formatted by putting space betwen the statement
+The control statements are formatted by putting space between the statement
and parenthesis in the following way:
@example
for (i = 0; i < filter->input_count; i++) @{
@@ -79,7 +79,7 @@ if (!pic || !picref)
goto fail;
@end example
@item
-Do not put spaces immediately inside parenthesis. @samp{if (ret)} is
+Do not put spaces immediately inside parentheses. @samp{if (ret)} is
a valid style; @samp{if ( ret )} is not.
@end itemize
diff --git a/doc/eval.texi b/doc/eval.texi
index 7d8106b89e..7f8f3653b3 100644
--- a/doc/eval.texi
+++ b/doc/eval.texi
@@ -1,7 +1,7 @@
@chapter Expression Evaluation
@c man begin EXPRESSION EVALUATION
-When evaluating an arithemetic expression, Libav uses an internal
+When evaluating an arithmetic expression, Libav uses an internal
formula evaluator, implemented through the @file{libavutil/eval.h}
interface.
@@ -53,7 +53,7 @@ returns the value stored in the internal variable.
@item ld(var)
Allow to load the value of the internal variable with number
-@var{var}, which was previosly stored with st(@var{var}, @var{expr}).
+@var{var}, which was previously stored with st(@var{var}, @var{expr}).
The function returns the loaded value.
@item while(cond, expr)
diff --git a/doc/filters.texi b/doc/filters.texi
index 101bec6d88..e022b46531 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -200,7 +200,7 @@ input plane. They are expressions, and can contain the following
constants:
@table @option
@item w, h
-the input width and heigth in pixels
+the input width and height in pixels
@item cw, ch
the input chroma image width and height in pixels
@@ -888,7 +888,7 @@ the corresponding mathematical approximated values for e
(euler number), pi (greek PI), PHI (golden ratio)
@item w, h
-the input width and heigth
+the input width and height
@item val
input value for the pixel component
@@ -992,7 +992,7 @@ The filter takes the parameters: @var{filter_name}@{:=@}@var{filter_params}.
filter. If not specified the default values are assumed.
Refer to the official libopencv documentation for more precise
-informations:
+information:
@url{http://opencv.willowgarage.com/documentation/c/image_filtering.html}
Follows the list of supported libopencv filters.
@@ -1008,7 +1008,7 @@ It accepts the parameters: @var{struct_el}:@var{nb_iterations}.
@var{struct_el} represents a structuring element, and has the syntax:
@var{cols}x@var{rows}+@var{anchor_x}x@var{anchor_y}/@var{shape}
-@var{cols} and @var{rows} represent the number of colums and rows of
+@var{cols} and @var{rows} represent the number of columns and rows of
the structuring element, @var{anchor_x} and @var{anchor_y} the anchor
point, and @var{shape} the shape for the structuring element, and
can be one of the values "rect", "cross", "ellipse", "custom".
@@ -1184,7 +1184,7 @@ value for @var{width} or @var{height} is 0, the corresponding input size
is used for the output.
The @var{width} expression can reference the value set by the
-@var{height} expression, and viceversa.
+@var{height} expression, and vice versa.
The default value of @var{width} and @var{height} is 0.
@@ -1194,7 +1194,7 @@ Specify the offsets where to place the input image in the padded area
with respect to the top/left border of the output image.
The @var{x} expression can reference the value set by the @var{y}
-expression, and viceversa.
+expression, and vice versa.
The default value of @var{x} and @var{y} is 0.
@@ -1608,7 +1608,7 @@ seconds
@item pos
position of the frame in the input stream, -1 if this information in
-unavailable and/or meanigless (for example in case of synthetic video)
+unavailable and/or meaningless (for example in case of synthetic video)
@item fmt
pixel format name
@@ -1825,7 +1825,7 @@ through the interface defined in @file{libavfilter/vsrc_buffer.h}.
It accepts the following parameters:
@var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den}
-All the parameters need to be explicitely defined.
+All the parameters need to be explicitly defined.
Follows the list of the accepted parameters.
@@ -2017,7 +2017,7 @@ separated by ":". The description of the accepted options follows.
@item size, s
Specify the size of the sourced video, it may be a string of the form
-@var{width}x@var{heigth}, or the name of a size abbreviation. The
+@var{width}x@var{height}, or the name of a size abbreviation. The
default value is "320x240".
@item rate, r
diff --git a/doc/general.texi b/doc/general.texi
index b4838f5ae9..bbeea641d2 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -485,7 +485,7 @@ following image formats are supported:
@item id RoQ video @tab X @tab X
@tab Used in Quake III, Jedi Knight 2, other computer games.
@item IFF ILBM @tab @tab X
- @tab IFF interlaved bitmap
+ @tab IFF interleaved bitmap
@item IFF ByteRun1 @tab @tab X
@tab IFF run length encoded bitmap
@item Intel H.263 @tab @tab X
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 225fda85c9..f5bb5324be 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -155,8 +155,8 @@ be seekable, so they will fail with the pipe output protocol.
Real-Time Messaging Protocol.
-The Real-Time Messaging Protocol (RTMP) is used for streaming multimeā€
-dia content across a TCP/IP network.
+The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
+content across a TCP/IP network.
The required syntax is:
@example
@@ -195,7 +195,7 @@ Real-Time Messaging Protocol and its variants supported through
librtmp.
Requires the presence of the librtmp headers and library during
-configuration. You need to explicitely configure the build with
+configuration. You need to explicitly configure the build with
"--enable-librtmp". If enabled this will replace the native RTMP
protocol.
diff --git a/doc/soc.txt b/doc/soc.txt
index e45bd6ce3b..89728b5201 100644
--- a/doc/soc.txt
+++ b/doc/soc.txt
@@ -18,7 +18,7 @@ essential that changes to their codebase are publicly visible, clean and
easy reviewable that again leads us to:
* use of a revision control system like git
* separation of cosmetic from non-cosmetic changes (this is almost entirely
- ignored by mentors and students in soc 2006 which might lead to a suprise
+ ignored by mentors and students in soc 2006 which might lead to a surprise
when the code will be reviewed at the end before a possible inclusion in
Libav, individual changes were generally not reviewable due to cosmetics).
* frequent commits, so that comments can be provided early