summaryrefslogtreecommitdiff
path: root/doc/avconv.texi
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-12-10 18:30:03 +0100
committerAnton Khirnov <anton@khirnov.net>2011-12-10 22:02:44 +0100
commit2e87b4c51152e0241cae7f655d53920029a0e632 (patch)
tree5e7f5eab158654147934fe324fe132222ce65153 /doc/avconv.texi
parent5bf663802233933aef81d220d7486b9c5be6ef3a (diff)
Warn about avserver being broken.
Also remove mentions of it from other avtools' manuals.
Diffstat (limited to 'doc/avconv.texi')
-rw-r--r--doc/avconv.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 68266a9ce4..9946aaa61c 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -256,7 +256,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} (default - same as source).
The following abbreviations are recognized:
@table @samp
@item sqcif
@@ -1025,7 +1025,7 @@ the input file in reverse order.
@settitle avconv video converter
@c man begin SEEALSO
-avplay(1), avprobe(1), avserver(1) and the Libav HTML documentation
+avplay(1), avprobe(1) and the Libav HTML documentation
@c man end
@c man begin AUTHORS