From: Carl Eugen Hoyos Date: Sat, 18 Jun 2011 07:36:07 +0000 (+0200) Subject: Fix -s documentation. X-Git-Tag: n0.8~50 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=47a8243c0db3fe497c490dfe2727a7a8422596cb;p=coroid%2Fffmpeg_saccubus.git Fix -s documentation. --- diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 4c0267743..6f2145121 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -169,7 +169,6 @@ Set frame rate (Hz value, fraction or abbreviation), (default = 25). 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