[Ffmpeg-cvslog] r7947 - trunk/doc/ffmpeg-doc.texi

[iive]

Author: iive
Date: Mon Feb 12 15:07:04 2007
New Revision: 7947

Modified:
   trunk/doc/ffmpeg-doc.texi

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


Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi	(original)
+++ trunk/doc/ffmpeg-doc.texi	Mon Feb 12 15:07:04 2007
@@ -299,7 +299,7 @@
 @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