summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-06-18 09:36:07 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-06-18 09:36:07 +0200
commit47a8243c0db3fe497c490dfe2727a7a8422596cb (patch)
treed63a593174b151abe9292603ec4edf058ce1ee78
parent2905e3ff6462431d55f89614b24e2a407707c82a (diff)
downloadffmpeg-47a8243c0db3fe497c490dfe2727a7a8422596cb.tar.gz
Fix -s documentation.
-rw-r--r--doc/ffmpeg.texi1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 4c02677437..6f21451219 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