diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-26 01:26:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-27 19:19:00 +0200 |
| commit | 7ec414892ddcad88313848494b6fc5f437c9ca4a (patch) | |
| tree | 58bc6cb2adcd50690e4f44bbf20a6825313f3451 /doc/demuxers.texi | |
| parent | 2634927fe30ea4a821db515c6b7f77458f5c4bc5 (diff) | |
| download | ffmpeg-7ec414892ddcad88313848494b6fc5f437c9ca4a.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>
Diffstat (limited to 'doc/demuxers.texi')
| -rw-r--r-- | doc/demuxers.texi | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 29a23d48b2..73dc0feec1 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -300,6 +300,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. |