Match the documentation of -s with the current implementation.

e1cfe04c · Carl Eugen Hoyos · 7b9750ed · e1cfe04c
Commit e1cfe04c authored Apr 01, 2011 by Carl Eugen Hoyos
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ffmpeg.texi doc/ffmpeg.texi +4 -1

No files found.
--- 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