OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2905e3f
)
Fix -s documentation.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 18 Jun 2011 07:36:07 +0000
(09:36 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 18 Jun 2011 07:36:07 +0000
(09:36 +0200)
doc/ffmpeg.texi
patch
|
blob
|
history
diff --git
a/doc/ffmpeg.texi
b/doc/ffmpeg.texi
index
4c02677
..
6f21451
100644
(file)
--- 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