diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-12-10 18:30:03 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-12-10 22:02:44 +0100 |
| commit | 2e87b4c51152e0241cae7f655d53920029a0e632 (patch) | |
| tree | 5e7f5eab158654147934fe324fe132222ce65153 /doc | |
| parent | 5bf663802233933aef81d220d7486b9c5be6ef3a (diff) | |
| download | ffmpeg-2e87b4c51152e0241cae7f655d53920029a0e632.tar.gz | |
Warn about avserver being broken.
Also remove mentions of it from other avtools' manuals.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/avconv.texi | 4 | ||||
| -rw-r--r-- | doc/avplay.texi | 2 | ||||
| -rw-r--r-- | doc/avprobe.texi | 2 | ||||
| -rw-r--r-- | doc/avserver.texi | 4 |
4 files changed, 8 insertions, 4 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 diff --git a/doc/avplay.texi b/doc/avplay.texi index 502580fb31..8fc33081de 100644 --- a/doc/avplay.texi +++ b/doc/avplay.texi @@ -172,7 +172,7 @@ Seek to percentage in file corresponding to fraction of width. @settitle AVplay media player @c man begin SEEALSO -avconv(1), avprobe(1), avserver(1) and the Libav HTML documentation +avconv(1), avprobe(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/avprobe.texi b/doc/avprobe.texi index 8955e1fdfa..6b2c800bf1 100644 --- a/doc/avprobe.texi +++ b/doc/avprobe.texi @@ -122,7 +122,7 @@ with name "STREAM". @settitle avprobe media prober @c man begin SEEALSO -avconv(1), avplay(1), avserver(1) and the Libav HTML documentation +avconv(1), avplay(1) and the Libav HTML documentation @c man end @c man begin AUTHORS diff --git a/doc/avserver.texi b/doc/avserver.texi index 9838028210..351ee0da19 100644 --- a/doc/avserver.texi +++ b/doc/avserver.texi @@ -22,6 +22,10 @@ avserver [options] @chapter Description @c man begin DESCRIPTION +WARNING: avserver is unmaintained, largely broken and in need of a +complete rewrite. It probably won't work for you. Use at your own +risk. + avserver is a streaming server for both audio and video. It supports several live feeds, streaming from files and time shifting on live feeds (you can seek to positions in the past on each live feed, provided you |