diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 23:09:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 23:13:31 +0200 |
| commit | 1ebc77bc7d68748598878c08c85a571b526a729f (patch) | |
| tree | 117f2f6b361c9b3649af288ce97047d3115b5fb4 | |
| parent | eba453e03ffeec8bb79cdcf35698e0fa13cc6d6e (diff) | |
| parent | 49a242687cf44f86570b706db3c5912ff06bc6c2 (diff) | |
| download | ffmpeg-1ebc77bc7d68748598878c08c85a571b526a729f.tar.gz | |
Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'
* commit '49a242687cf44f86570b706db3c5912ff06bc6c2':
doc: Document segment_list_type
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/muxers.texi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 4f8c3c10e4..da7f186dbc 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -814,6 +814,13 @@ Allow caching (only affects M3U8 list files). Allow live-friendly file generation. @end table +@item segment_list_type @var{type} +Select the listing format. +@table @option +@item @var{flat} use a simple flat list of entries. +@item @var{hls} use a m3u8-like structure. +@end table + @item segment_list_size @var{size} Update the list file so that it contains at most the last @var{size} segments. If 0 the list file will contain all the segments. Default @@ -823,9 +830,6 @@ value is 0. Prepend @var{prefix} to each entry. Useful to generate absolute paths. By default no prefix is applied. -@item segment_list_type @var{type} -Specify the format for the segment list file. - The following values are recognized: @table @samp @item flat |