summaryrefslogtreecommitdiff
path: root/doc/avconv.texi
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-05-26 16:52:58 +0200
committerAnton Khirnov <anton@khirnov.net>2012-05-29 19:19:17 +0200
commitc9cc76290f8139a012a12efe7e581276b8bd8dff (patch)
tree18a4c16ac1e7d3b3a2683fddbe8bb52b2767f042 /doc/avconv.texi
parent4f81a5072a59798e22ffacb091b4dd6b865b9a80 (diff)
avconv: extend -r to work on any input stream.
This is done by automatically inserting a setpts filter.
Diffstat (limited to 'doc/avconv.texi')
-rw-r--r--doc/avconv.texi11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 693c45e429..2ebfe9fe44 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -257,8 +257,15 @@ attachments.
@item -vframes @var{number} (@emph{output})
Set the number of video frames to record. This is an alias for @code{-frames:v}.
@item -r[:@var{stream_specifier}] @var{fps} (@emph{input/output,per-stream})
-Set frame rate (Hz value, fraction or abbreviation), (default = 25). For output
-streams implies @code{-vsync cfr}.
+Set frame rate (Hz value, fraction or abbreviation).
+
+As an input option, ignore any timestamps stored in the file and instead
+generate timestamps assuming constant frame rate @var{fps}.
+
+As an output option, duplicate or drop input frames to achieve constant output
+frame rate @var{fps} (note that this actually causes the @code{fps} filter to be
+inserted to the end of the corresponding filtergraph).
+
@item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream})
Set frame size.