Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'

[ffmpeg] / doc / muxers.texi

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 34eed0fd200d535e919673485113526c8daf4993..1c8f93bdb0f34135b6d31dda680aae76c13b7b64 100644 (file)
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -129,6 +129,27 @@ ffmpeg -i INPUT -f framemd5 -
 
 See also the @ref{md5} muxer.
 
+@anchor{hls}
+@section hls
+
+Apple HTTP Live Streaming muxer that segments MPEG-TS according to
+the HTTP Live Streaming specification.
+
+It creates a playlist file and numbered segment files. The output
+filename specifies the playlist filename; the segment filenames
+receive the same basename as the playlist, a sequential number and
+a .ts extension.
+
+@example
+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
+@end table
+
 @anchor{ico}
 @section ico