diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2007-02-12 14:07:04 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2007-02-12 14:07:04 +0000 |
| commit | 67053c30930c537a1c9291d87faaf7aaa071b629 (patch) | |
| tree | 8f0d9966f1e9862d8c15343dda3d9f1eda1af51b /doc | |
| parent | c7238c72cbcbdc602cd57ed82635eeaf3d0a7a61 (diff) | |
-s option have different defaults for ffmpeg and ffserver cases.
Originally committed as revision 7947 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 805efcccbc..768471b53f 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -299,7 +299,7 @@ Set the number of video frames to record. @item -r fps Set frame rate (Hz value, fraction or abbreviation), (default = 25). @item -s size -Set frame size. The format is @samp{wxh} (default = 160x128). +Set frame size. The format is @samp{wxh} (ffserver default = 160x128, ffmpeg default = same as source). The following abbreviations are recognized: @table @samp @item sqcif |