projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7238c7
)
-s option have different defaults for ffmpeg and ffserver cases.
author
Ivan Kalvachev
<ikalvachev@gmail.com>
Mon, 12 Feb 2007 14:07:04 +0000
(14:07 +0000)
committer
Ivan Kalvachev
<ikalvachev@gmail.com>
Mon, 12 Feb 2007 14:07:04 +0000
(14:07 +0000)
Originally committed as revision 7947 to svn://svn.ffmpeg.org/ffmpeg/trunk
doc/ffmpeg-doc.texi
patch
|
blob
|
history
diff --git
a/doc/ffmpeg-doc.texi
b/doc/ffmpeg-doc.texi
index
805efcc
..
768471b
100644
(file)
--- a/
doc/ffmpeg-doc.texi
+++ b/
doc/ffmpeg-doc.texi
@@
-299,7
+299,7
@@
Set the number of video frames to record.
@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