summaryrefslogtreecommitdiff
path: root/doc/indevs.texi
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2013-03-30 14:55:47 -0400
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2013-03-31 18:22:08 -0400
commitfe64b88950d417ed36add4229bce5fa8668edb5a (patch)
treeec8d08131fe05e59c0153f35d26df12e78f97cef /doc/indevs.texi
parent91b5ee66998ea28cdafb5ca31cbebc55ddf4cdb9 (diff)
doc: Consistently use 'frame rate' everywhere
We used to use 'framerate' or 'frame rate' randomly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'doc/indevs.texi')
-rw-r--r--doc/indevs.texi10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/indevs.texi b/doc/indevs.texi
index 63104e22ed..5e8d215f6b 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -86,7 +86,7 @@ fail to open.
Set the video size in the captured video.
@item framerate
-Set the framerate in the captured video.
+Set the frame rate in the captured video.
@item sample_rate
Set the sample rate (in Hz) of the captured audio.
@@ -600,7 +600,7 @@ kind @file{/dev/video@var{N}}, where @var{N} is a number associated to
the device.
Video4Linux2 devices usually support a limited set of
-@var{width}x@var{height} sizes and framerates. You can check which are
+@var{width}x@var{height} sizes and frame rates. You can check which are
supported using @command{-list_formats all} for Video4Linux2 devices.
Some devices, like TV cards, support one or more standards. It is possible
to list all the supported standards using @command{-list_standards all}.
@@ -623,7 +623,7 @@ ffplay -f video4linux2 -framerate 30 -video_size hd720 /dev/video0
@item
Grab and record the input of a video4linux2 device, leave the
-framerate and size as previously set:
+frame rate and size as previously set:
@example
ffmpeg -f video4linux2 -input_format mjpeg -i /dev/video0 out.mpeg
@end example
@@ -656,7 +656,7 @@ This option allows to select the input format, when several are
available.
@item framerate
-Set the preferred video framerate.
+Set the preferred video frame rate.
@item list_formats
List available formats (supported pixel formats, codecs, and frame
@@ -772,7 +772,7 @@ ffmpeg -f x11grab -follow_mouse 100 -r 25 -s cif -i :0.0 out.mpg
@item framerate
Set the grabbing frame rate. Default value is @code{ntsc},
-corresponding to a framerate of @code{30000/1001}.
+corresponding to a frame rate of @code{30000/1001}.
@item show_region
Show grabbed region on screen.