summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLou Logan <lou@lrcd.com>2014-06-02 18:46:04 -0800
committerLou Logan <lou@lrcd.com>2014-06-03 10:58:19 -0800
commit88f2586adbcdcb350b2923a82bcb07c5a519bd1d (patch)
treed4c93e604c90148368ae9c3327be9839c33f3c27 /doc
parent137c5e115b0f1bff1867a3a09f3a2f14cfda2fb5 (diff)
fix various typos
Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/codecs.texi2
-rw-r--r--doc/encoders.texi2
-rw-r--r--doc/examples/decoding_encoding.c2
-rw-r--r--doc/faq.texi2
-rw-r--r--doc/muxers.texi2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/codecs.texi b/doc/codecs.texi
index ec69a581ba..b5255cbdc4 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -886,7 +886,7 @@ Set frame skip factor.
Set frame skip exponent.
Negative values behave identical to the corresponding positive ones, except
that the score is normalized.
-Positive values exist primarly for compatibility reasons and are not so useful.
+Positive values exist primarily for compatibility reasons and are not so useful.
@item skipcmp @var{integer} (@emph{encoding,video})
Set frame skip compare function.
diff --git a/doc/encoders.texi b/doc/encoders.texi
index d48df7d302..70d5c68bbe 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -80,7 +80,7 @@ thresholds with quantizer steps to find the appropriate quantization with
distortion below threshold band by band.
The quality of this method is comparable to the two loop searching method
-descibed below, but somewhat a little better and slower.
+described below, but somewhat a little better and slower.
@item anmr
Average noise to mask ratio (ANMR) trellis-based solution.
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/decoding_encoding.c
index 0585e518ad..556fe989d7 100644
--- a/doc/examples/decoding_encoding.c
+++ b/doc/examples/decoding_encoding.c
@@ -640,7 +640,7 @@ int main(int argc, char **argv)
"This program generates a synthetic stream and encodes it to a file\n"
"named test.h264, test.mp2 or test.mpg depending on output_type.\n"
"The encoded stream is then decoded and written to a raw data output.\n"
- "output_type must be choosen between 'h264', 'mp2', 'mpg'.\n",
+ "output_type must be chosen between 'h264', 'mp2', 'mpg'.\n",
argv[0]);
return 1;
}
diff --git a/doc/faq.texi b/doc/faq.texi
index 74c259f2bb..fdcb46d334 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -392,7 +392,7 @@ VOB and a few other formats do not have a global header that describes
everything present in the file. Instead, applications are supposed to scan
the file to see what it contains. Since VOB files are frequently large, only
the beginning is scanned. If the subtitles happen only later in the file,
-they will not be initally detected.
+they will not be initially detected.
Some applications, including the @code{ffmpeg} command-line tool, can only
work with streams that were detected during the initial scan; streams that
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 67ad9da736..42a9fdda5f 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -714,7 +714,7 @@ Change the syncpoint usage in nut:
@table @option
@item @var{default} use the normal low-overhead seeking aids.
@item @var{none} do not use the syncpoints at all, reducing the overhead but making the stream non-seekable;
- Use of this option is not recommanded, as the resulting files are very damage
+ Use of this option is not recommended, as the resulting files are very damage
sensitive and seeking is not possible. Also in general the overhead from
syncpoints is negligible. Note, -@code{write_index} 0 can be used to disable
all growing data tables, allowing to mux endless streams with limited memory