From e1cfe04c766c1a703bc3671fde7d651f2b79b230 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 2 Apr 2011 00:24:26 +0200 Subject: Match the documentation of -s with the current implementation. --- doc/ffmpeg.texi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc') 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 -- cgit v1.2.3