diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-02 00:24:26 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-02 00:25:57 +0200 |
| commit | e1cfe04c766c1a703bc3671fde7d651f2b79b230 (patch) | |
| tree | 69e7ee0f103e0c89746d4bb4afb823c545209bb5 /doc | |
| parent | 7b9750ed9b4d500e8f322a58a9cc2032eddc666b (diff) | |
| download | ffmpeg-e1cfe04c766c1a703bc3671fde7d651f2b79b230.tar.gz | |
Match the documentation of -s with the current implementation.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index af9d6ba87a..222cfec576 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -168,7 +168,10 @@ 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} (ffserver default = 160x128). +There is no default for input streams, +for output streams it is set by default to the size of the source stream. +If the input file has video streams with different resolutions, the behaviour is undefined. The following abbreviations are recognized: @table @samp @item sqcif |