[FFmpeg-cvslog] Fix -s documentation.

Carl Eugen Hoyos git at videolan.org
Sat Jun 18 09:36:36 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jun 18 09:36:07 2011 +0200| [47a8243c0db3fe497c490dfe2727a7a8422596cb] | committer: Carl Eugen Hoyos

Fix -s documentation.

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

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

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 4c02677..6f21451 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



More information about the ffmpeg-cvslog mailing list