summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-13 23:52:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-13 23:52:43 +0200
commitb62e42dafefd489eab551e9de8e69a947f650786 (patch)
tree85e0daec02e919d5c7917650d9f573fc3abb0f12 /doc/ffmpeg.texi
parentcac9877ed5150bb6feda64927bb327ee4698086a (diff)
doc/ffmpeg: s/avserver/ffserver/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 0984c19fbe..74e826ac51 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -210,7 +210,7 @@ Set the number of video frames to record. This is an alias for @code{-frames:v}.
@item -r[:@var{stream_specifier}] @var{fps} (@emph{input/output,per-stream})
Set frame rate (Hz value, fraction or abbreviation), (default = 25).
@item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream})
-Set frame size. The format is @samp{wxh} (avserver default = 160x128, ffmpeg default = same as source).
+Set frame size. The format is @samp{wxh} (ffserver default = 160x128, ffmpeg default = same as source).
The following abbreviations are recognized:
@table @samp
@item sqcif