[FFmpeg-cvslog] Match the documentation of -s with the current implementation.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Apr  2 00:24:26 2011 +0200| [e1cfe04c766c1a703bc3671fde7d651f2b79b230] | committer: Carl Eugen Hoyos

Match the documentation of -s with the current implementation.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1cfe04c766c1a703bc3671fde7d651f2b79b230
---

 doc/ffmpeg.texi |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index af9d6ba..222cfec 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