summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-12-10 09:25:50 +0100
committerAnton Khirnov <anton@khirnov.net>2023-01-10 11:49:28 +0100
commite884360e913a08c085ae29ffc1461a2bb205d550 (patch)
treea4e24244e3110f26446bd5667c4ee118b8318b4d
parent7655249f729bdd63f506b667591cd48f8d1006d8 (diff)
doc/ffmpeg: improve -r documentation
Explain different behavior for encoding and streamcopy.
-rw-r--r--doc/ffmpeg.texi13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 65634b82cf..67b3294256 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -877,9 +877,20 @@ This is not the same as the @option{-framerate} option used for some input forma
like image2 or v4l2 (it used to be the same in older versions of FFmpeg).
If in doubt use @option{-framerate} instead of the input option @option{-r}.
-As an output option, duplicate or drop input frames to achieve constant output
+As an output option:
+@table @option
+@item video encoding
+Duplicate or drop frames right before encoding them to achieve constant output
frame rate @var{fps}.
+@item video streamcopy
+Indicate to the muxer that @var{fps} is the stream frame rate. No data is
+dropped or duplicated in this case. This may produce invalid files if @var{fps}
+does not match the actual stream frame rate as determined by packet timestamps.
+See also the @code{setts} bitstream filter.
+
+@end table
+
@item -fpsmax[:@var{stream_specifier}] @var{fps} (@emph{output,per-stream})
Set maximum frame rate (Hz value, fraction or abbreviation).