aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-12 04:17:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-12 06:07:58 +0200
commitad2fba8619223fc9ba9a482666115da87ee14fb8 (patch)
tree08b85c7e510dd545b233c57021ddf68015f8b782
parent7e4111cfe2f5d03af8d608757e897145aa252af8 (diff)
downloadffmpeg-ad2fba8619223fc9ba9a482666115da87ee14fb8.tar.gz
doc: replace avserver by ffserver as we have not done that rename
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/avconv.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index ef320789c2..8cf5cfddd8 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -198,7 +198,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, avconv default = same as source).
+Set frame size. The format is @samp{wxh} (ffserver default = 160x128, avconv default = same as source).
The following abbreviations are recognized:
@table @samp
@item sqcif