Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTobias Rapp <t.rapp@noa-archive.com>2017-10-05 11:14:26 +0300
committerTobias Rapp <t.rapp@noa-archive.com>2017-10-05 11:33:38 +0300
commit4f5fb7813423ae67d3a6897999cc97e02f75dee1 (patch)
tree9f045ab7d9df1d9da95308823a6aedf68241533e /doc
parente01a270762c1b79e10566e5e55a7eb4488b8a25b (diff)
doc/filters: align order of fps filter options to implementation
Align order of "start_time" option within fps filter documentation to actual implementation. Also fix some documentation cosmetics. Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/filters.texi22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 601701f591..624e5cd01b 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -8669,13 +8669,21 @@ It accepts the following parameters:
@item fps
The desired output frame rate. The default is @code{25}.
+@item start_time
+Assume the first PTS should be the given value, in seconds. This allows for
+padding/trimming at the start of stream. By default, no assumption is made
+about the first frame's expected PTS, so no padding or trimming is done.
+For example, this could be set to 0 to pad the beginning with duplicates of
+the first frame if a video stream starts after the audio stream or to trim any
+frames with a negative PTS.
+
@item round
-Rounding method.
+Timestamp (PTS) rounding method.
Possible values are:
@table @option
@item zero
-zero round towards 0
+round towards 0
@item inf
round away from 0
@item down
@@ -8687,18 +8695,10 @@ round to nearest
@end table
The default is @code{near}.
-@item start_time
-Assume the first PTS should be the given value, in seconds. This allows for
-padding/trimming at the start of stream. By default, no assumption is made
-about the first frame's expected PTS, so no padding or trimming is done.
-For example, this could be set to 0 to pad the beginning with duplicates of
-the first frame if a video stream starts after the audio stream or to trim any
-frames with a negative PTS.
-
@end table
Alternatively, the options can be specified as a flat string:
-@var{fps}[:@var{round}].
+@var{fps}[:@var{start_time}[:@var{round}]].
See also the @ref{setpts} filter.