[FFmpeg-cvslog] docs: Spelling fixes to 9 texi files from /doc
root
git at videolan.org
Tue Nov 29 18:33:59 CET 2011
ffmpeg | branch: master | root <root at muzej.(none)> | Tue Nov 29 17:54:49 2011 +0100| [551b9eb9efa68fa8adf843f190358237308f7e9a] | committer: Michael Niedermayer
docs: Spelling fixes to 9 texi files from /doc
credits to: Violet Lin (from Google Code-in)
Signed-off-by: burek <burek021 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=551b9eb9efa68fa8adf843f190358237308f7e9a
---
doc/avtools-common-opts.texi | 2 +-
doc/decoders.texi | 2 +-
doc/demuxers.texi | 2 +-
doc/eval.texi | 10 +++++-----
doc/ffmpeg.texi | 6 +++---
doc/filters.texi | 28 ++++++++++++++--------------
doc/indevs.texi | 12 ++++++------
doc/outdevs.texi | 2 +-
doc/protocols.texi | 6 +++---
9 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi
index 33b3b48..59db4fe 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/decoders.texi b/doc/decoders.texi
index 18ac2fa..e7baada 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -27,7 +27,7 @@ follows.
@section rawvideo
-Rawvideo decoder.
+Raw video decoder.
This decoder decodes rawvideo streams.
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index ffaadfe..76d13b1 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -51,7 +51,7 @@ same for all the files in the sequence.
The following example shows how to use @file{ffmpeg} for creating a
video from the images in the file sequence @file{img-001.jpeg},
- at file{img-002.jpeg}, ..., assuming an input framerate of 10 frames per
+ at file{img-002.jpeg}, ..., assuming an input frame rate of 10 frames per
second:
@example
ffmpeg -r 10 -f image2 -i 'img-%03d.jpeg' out.avi
diff --git a/doc/eval.texi b/doc/eval.texi
index 18d8487..d0834e0 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, FFmpeg uses an internal
+When evaluating an arithmetic expression, FFmpeg 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
- at var{var}, which was previosly stored with st(@var{var}, @var{expr}).
+ at var{var}, which was previously stored with st(@var{var}, @var{expr}).
The function returns the loaded value.
@item while(cond, expr)
@@ -102,11 +102,11 @@ Return the greatest common divisor of @var{x} and @var{y}. If both @var{x} and
The following constants are available:
@table @option
@item PI
-area of the unit disc, approximatively 3.14
+area of the unit disc, approximately 3.14
@item E
-exp(1) (Euler's number), approximatively 2.718
+exp(1) (Euler's number), approximately 2.718
@item PHI
-golden ratio (1+sqrt(5))/2, approximatively 1.618
+golden ratio (1+sqrt(5))/2, approximately 1.618
@end table
Note that:
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index b0d3a45..f6ca7dc 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -84,7 +84,7 @@ described.
@table @option
@item -f @var{fmt} (@emph{input/output})
-Force input or output file format. The format is normally autodetected for input
+Force input or output file format. The format is normally auto detected for input
files and guessed from file extension for output files, so this option is not
needed in most cases.
@@ -102,7 +102,7 @@ Do not overwrite output files but exit if file exists.
Select an encoder (when used before an output file) or a decoder (when used
before an input file) for one or more streams. @var{codec} is the name of a
decoder/encoder or a special value @code{copy} (output only) to indicate that
-the stream is not to be reencoded.
+the stream is not to be re-encoded.
For example
@example
@@ -449,7 +449,7 @@ and the following constants are available:
@end table
@item -rc_override[:@var{stream_specifier}] @var{override} (@emph{output,per-stream})
-Rate control override for specific intervals, formated as "int,int,int"
+Rate control override for specific intervals, formatted as "int,int,int"
list separated with slashes. Two first values are the beginning and
end frame numbers, last one is quantizer to use if positive, or quality
factor if negative.
diff --git a/doc/filters.texi b/doc/filters.texi
index e583e9e..fb32433 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -439,7 +439,7 @@ aevalsrc=0
@item
-Generate a sin signal with frequence of 440 Hz, set sample rate to
+Generate a sin signal with frequency of 440 Hz, set sample rate to
8000 Hz:
@example
aevalsrc="sin(440*2*PI*t)::s=8000"
@@ -628,7 +628,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
@@ -1089,7 +1089,7 @@ following constants:
@table @option
@item w, h
-the input width and heigth
+the input width and height
@item tw, text_w
the width of the rendered text
@@ -1367,7 +1367,7 @@ For more information see:
@section gradfun
Fix the banding artifacts that are sometimes introduced into nearly flat
-regions by truncation to 8bit colordepth.
+regions by truncation to 8bit color depth.
Interpolate the gradients that should go where the bands are, and
dither them.
@@ -1491,7 +1491,7 @@ The expressions can contain the following constants and functions:
@table @option
@item w, h
-the input width and heigth
+the input width and height
@item val
input value for the pixel component
@@ -1688,7 +1688,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.
@@ -1704,7 +1704,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 at var{rows}+ at var{anchor_x}x at var{anchor_y}/@var{shape}
- at var{cols} and @var{rows} represent the number of colums and rows of
+ at 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".
@@ -1805,7 +1805,7 @@ The description of the accepted options follows.
@table @option
@item rgb
If set to 1, force the filter to accept inputs in the RGB
-colorspace. Default value is 0.
+color space. Default value is 0.
@end table
Be aware that frames are taken from each input video in timestamp
@@ -1892,7 +1892,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
- at var{height} expression, and viceversa.
+ at var{height} expression, and vice versa.
The default value of @var{width} and @var{height} is 0.
@@ -1902,7 +1902,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.
@@ -2317,7 +2317,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
@@ -2766,7 +2766,7 @@ section @ref{frei0r} in the description of the video filters.
Some examples follow:
@example
-# generate a frei0r partik0l source with size 200x200 and framerate 10
+# generate a frei0r partik0l source with size 200x200 and frame rate 10
# which is overlayed on the overlay filter main input
frei0r_src=200x200:10:partik0l=1234 [overlay]; [in][overlay] overlay
@end example
@@ -2792,7 +2792,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
- at var{width}x at var{heigth}, or the name of a size abbreviation. The
+ at var{width}x at var{height}, or the name of a size abbreviation. The
default value is "320x240".
@item rate, r
@@ -2823,7 +2823,7 @@ testsrc=duration=5.3:size=qcif:rate=10
@end example
will generate a video with a duration of 5.3 seconds, with size
-176x144 and a framerate of 10 frames per second.
+176x144 and a frame rate of 10 frames per second.
If the input content is to be ignored, @code{nullsrc} can be used. The
following command generates noise in the luminance plane by employing
diff --git a/doc/indevs.texi b/doc/indevs.texi
index 90ae29c..6dcc5a6 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -250,7 +250,7 @@ labelled by a unique string of the form "out at var{N}", where @var{N} is a
number starting from 0 corresponding to the mapped input stream
generated by the device.
The first unlabelled output is automatically assigned to the "out0"
-label, but all the others need to be specified explicitely.
+label, but all the others need to be specified explicitly.
If not specified defaults to the filename specified for the input
device.
@@ -515,12 +515,12 @@ kind @file{/dev/video at var{N}}, where @var{N} is a number associated to
the device.
Video4Linux and Video4Linux2 devices only support a limited set of
- at var{width}x at var{height} sizes and framerates. You can check which are
+ at var{width}x at var{height} sizes and frame rates. You can check which are
supported for example with the command @file{dov4l} for Video4Linux
devices and the command @file{v4l-info} for Video4Linux2 devices.
If the size for the device is set to 0x0, the input device will
-try to autodetect the size to use.
+try to auto-detect the size to use.
Only for the video4linux2 device, if the frame rate is set to 0/0 the
input device will use the frame rate value already set in the driver.
@@ -537,10 +537,10 @@ tools.
# to the default of 25/1.
ffplay -s 320x240 -f video4linux /dev/video0
-# Grab and show the input of a video4linux2 device, autoadjust size.
+# Grab and show the input of a video4linux2 device, auto-adjust size.
ffplay -f video4linux2 /dev/video0
-# Grab and record the input of a video4linux2 device, autoadjust size,
+# Grab and record the input of a video4linux2 device, auto-adjust size,
# frame rate value defaults to 0/0 so it is read from the video4linux2
# driver.
ffmpeg -f video4linux2 -i /dev/video0 out.mpeg
@@ -570,7 +570,7 @@ The filename passed as input has the syntax:
@var{hostname}:@var{display_number}. at var{screen_number} specifies the
X11 display name of the screen to grab from. @var{hostname} can be
-ommitted, and defaults to "localhost". The environment variable
+omitted, and defaults to "localhost". The environment variable
@env{DISPLAY} contains the default display name.
@var{x_offset} and @var{y_offset} specify the offsets of the grabbed
diff --git a/doc/outdevs.texi b/doc/outdevs.texi
index 79619f8..f352ffc 100644
--- a/doc/outdevs.texi
+++ b/doc/outdevs.texi
@@ -28,7 +28,7 @@ OSS (Open Sound System) output device.
@section sdl
-SDL (Simple Directmedia Layer) output device.
+SDL (Simple DirectMedia Layer) output device.
This output devices allows to show a video stream in an SDL
window. Only one SDL window is allowed per application, so you can
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 2cfa0b5..87773ce 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.
More information about the ffmpeg-cvslog
mailing list