diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-26 21:56:56 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-09 19:56:25 +0200 |
| commit | 4d58e4cb4ca8e04317fecea432ea3272a445877c (patch) | |
| tree | 5993f50a8aa70e6266ad9c8fdc82b1c2eab2a25d /doc/ffmpeg.texi | |
| parent | 9e12f0bf5f45361a36f9d8c3abca24af55ca740c (diff) | |
| download | ffmpeg-4d58e4cb4ca8e04317fecea432ea3272a445877c.tar.gz | |
Rename ffserver to avserver.
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index af9bdcd3f3..32916a7c96 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -164,7 +164,7 @@ Set the number of video frames to record. @item -r @var{fps} Set frame rate (Hz value, fraction or abbreviation), (default = 25). @item -s @var{size} -Set frame size. The format is @samp{wxh} (ffserver default = 160x128, ffmpeg default = same as source). +Set frame size. The format is @samp{wxh} (avserver default = 160x128, ffmpeg default = same as source). The following abbreviations are recognized: @table @samp @item sqcif @@ -726,7 +726,7 @@ Set RTP payload size in bytes. Read input at native frame rate. Mainly used to simulate a grab device. @item -loop_input Loop over the input stream. Currently it works only for image -streams. This option is used for automatic FFserver testing. +streams. This option is used for automatic AVserver testing. This option is deprecated, use -loop. @item -loop_output @var{number_of_times} Repeatedly loop output for formats that support looping such as animated GIF @@ -1079,7 +1079,7 @@ file to which you want to add them. @settitle ffmpeg video converter @c man begin SEEALSO -avplay(1), avprobe(1), ffserver(1) and the Libav HTML documentation +avplay(1), avprobe(1), avserver(1) and the Libav HTML documentation @c man end @c man begin AUTHORS |