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
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-06 19:11:38 +0300
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-07 03:25:32 +0300
commita7f841718ff93e3143f218cfdc27d1764024b0eb (patch)
tree4511a14de24689589002fbc6eca4d99fafd5c7bf /doc/muxers.texi
parent9665fd31e8f5d9738e742fcdf0e76ea9ce76b049 (diff)
doc/muxers.texi: Readd documentation removed accidentally
Happened in e7c04eaf50b4b50f2528ab2c69b76777a1862535. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'doc/muxers.texi')
-rw-r--r--doc/muxers.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 1f9f2937f8..74833d7611 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -242,6 +242,8 @@ This is a deprecated option to set the segment length in microseconds, use @var{
@item seg_duration @var{duration}
Set the segment length in seconds (fractional value can be set). The value is
treated as average segment duration when @var{use_template} is enabled and
+@var{use_timeline} is disabled and as minimum segment duration for all the other
+use cases.
@item frag_duration @var{duration}
Set the length in seconds of fragments within segments (fractional value can be set).
@item frag_type @var{type}