diff mbox series

[FFmpeg-devel,5/5] doc/muxers.texi: Readd documentation removed accidentally

Message ID 20210307001601.2126517-5-andreas.rheinhardt@gmail.com
State Accepted
Commit a7f841718ff93e3143f218cfdc27d1764024b0eb
Headers show
Series [FFmpeg-devel,1/5] avcodec/avcodec: Don't suggest calling deprecated avcodec_register_all() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt March 7, 2021, 12:16 a.m. UTC
Happened in e7c04eaf50b4b50f2528ab2c69b76777a1862535.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 doc/muxers.texi | 2 ++
 1 file changed, 2 insertions(+)

Comments

James Almer March 7, 2021, 12:23 a.m. UTC | #1
On 3/6/2021 9:16 PM, Andreas Rheinhardt wrote:
> Happened in e7c04eaf50b4b50f2528ab2c69b76777a1862535.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>   doc/muxers.texi | 2 ++
>   1 file changed, 2 insertions(+)
> 
> 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}

LGTM.
diff mbox series

Patch

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}