-s option have different defaults for ffmpeg and ffserver cases.

[ffmpeg] / doc / ffmpeg-doc.texi

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 428f035dc0467324eb8adea0914b3f68e92d9088..768471b53f51241ba8f2cc0153977b0b4ffd922b 100644 (file)
--- 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
@@ -1029,7 +1029,7 @@ following image formats are supported:
 @item AC3                    @tab  IX  @tab  IX
 @tab liba52 is used internally for decoding.
 @item Vorbis                 @tab  X   @tab  X
-@item WMA V1/V2              @tab      @tab X
+@item WMA V1/V2              @tab X    @tab X
 @item AAC                    @tab X    @tab X
 @tab Supported through the external library libfaac/libfaad.
 @item Microsoft ADPCM        @tab X    @tab X