aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-08-26 01:26:58 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-08-28 01:41:37 +0200
commit498e07daa18cca6115eb415e592cde3701a2b800 (patch)
tree27cc0f8fcc0e1345658278d6eaf1393c35f9e315 /doc
parentbc57c799704ae3a38deca9f522c1561f73efcf85 (diff)
downloadffmpeg-498e07daa18cca6115eb415e592cde3701a2b800.tar.gz
avformat/hls: Fix DoS due to infinite loop
Fixes: loop.m3u The default max iteration count of 1000 is arbitrary and ideas for a better solution are welcome Found-by: Xiaohei and Wangchu from Alibaba Security Team Previous version reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7ec414892ddcad88313848494b6fc5f437c9ca4a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc')
-rw-r--r--doc/demuxers.texi18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 99b221c4b4..9cef8877a9 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -283,6 +283,24 @@ used to end the output video at the length of the shortest input file,
which in this case is @file{input.mp4} as the GIF in this example loops
infinitely.
+@section hls
+
+HLS demuxer
+
+It accepts the following options:
+
+@table @option
+@item live_start_index
+segment index to start live streams at (negative values are from the end).
+
+@item allowed_extensions
+',' separated list of file extensions that hls is allowed to access.
+
+@item max_reload
+Maximum number of times a insufficient list is attempted to be reloaded.
+Default value is 1000.
+@end table
+
@section image2
Image file demuxer.