Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

[ffmpeg] / doc / muxers.texi

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 1c8f93bdb0f34135b6d31dda680aae76c13b7b64..25cf5654141a8ad4ca16ad4177cc8aa58032e92b 100644 (file)
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -145,9 +145,14 @@ ffmpeg -i in.nut out.m3u8
 @end example
 
 @table @option
-@item -hls_time segment length in seconds
-@item -hls_list_size maximum number of playlist entries
-@item -hls_wrap number after which index wraps
+@item -hls_time @var{seconds}
+Set the segment length in seconds.
+@item -hls_list_size @var{size}
+Set the maximum number of playlist entries.
+@item -hls_wrap @var{wrap}
+Set the number after which index wraps.
+@item -start_number @var{number}
+Start the sequence from @var{number}.
 @end table
 
 @anchor{ico}
@@ -235,6 +240,11 @@ Note also that the pattern must not necessarily contain "%d" or
 ffmpeg -i in.avi -f image2 -frames:v 1 img.jpeg
 @end example
 
+@table @option
+@item -start_number @var{number}
+Start the sequence from @var{number}.
+@end table
+
 The image muxer supports the .Y.U.V image file format. This format is
 special in that that each image frame consists of three files, for
 each of the YUV420P components. To read or write this image file format,
@@ -588,8 +598,18 @@ the specified time and the time set by @var{force_key_frames}.
 @item segment_times @var{times}
 Specify a list of split points. @var{times} contains a list of comma
 separated duration specifications, in increasing order.
+
 @item segment_wrap @var{limit}
 Wrap around segment index once it reaches @var{limit}.
+
+@item segment_start_number @var{number}
+Set the sequence number of the first segment. Defaults to @code{0}.
+
+@item reset_timestamps @var{1|0}
+Reset timestamps at the begin of each segment, so that each segment
+will start with near-zero timestamps. It is meant to ease the playback
+of the generated segments. May not work with some combinations of
+muxers/codecs. It is set to @code{0} by default.
 @end table
 
 Some examples follow.