[FFmpeg-cvslog] doc/avconv: expand documentation for the -s option.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat May 26 13:52:44 2012 +0200| [4f81a5072a59798e22ffacb091b4dd6b865b9a80] | committer: Anton Khirnov

doc/avconv: expand documentation for the -s option.

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

 doc/avconv.texi |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/avconv.texi b/doc/avconv.texi
index d6e4096..693c45e 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -260,8 +260,18 @@ Set the number of video frames to record. This is an alias for @code{-frames:v}.
 Set frame rate (Hz value, fraction or abbreviation), (default = 25). For output
 streams implies @code{-vsync cfr}.
 @item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream})
-Set frame size. The format is @samp{wxh} (default - same as source).
-The following abbreviations are recognized:
+Set frame size.
+
+As an input option, this is a shortcut for the @option{video_size} private
+option, recognized by some demuxers for which the frame size is either not
+stored in the file or is configurable -- e.g. raw video or video grabbers.
+
+As an output option, this inserts the @code{scale} video filter to the
+ at emph{end} of the corresponding filtergraph. Please use the @code{scale} filter
+directly to insert it at the beginning or some other place.
+
+The format is @samp{wxh} (default - same as source).  The following
+abbreviations are recognized:
 @table @samp
 @item sqcif
 128x96