summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDeHackEd <git@dehacked.net>2017-08-06 15:10:35 +0800
committerSteven Liu <lq@chinaffmpeg.org>2017-08-06 15:10:35 +0800
commiteabeb9093abe0169a574945760ad3a26bf47cba4 (patch)
treeb2df573b94fbbaca1201ecfea7373aefa5065a9a /doc
parent1e443051b277f73b94a2f660d3fd31a1a7beab52 (diff)
avformat/hlsenc: allow dynamic encryption key rotation
Makes behaviour of 805ce25b1d2f optional, re-enables HLS key rotation feature Reviewed-by: Steven Liu <lq@onvideo.cn> Signed-off-by: DHE <git@dehacked.net>
Diffstat (limited to 'doc')
-rw-r--r--doc/muxers.texi7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 94472cef44..2bec5f8954 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -551,7 +551,7 @@ format. The optional third line specifies the initialization vector (IV) as a
hexadecimal string to be used instead of the segment sequence number (default)
for encryption. Changes to @var{key_info_file} will result in segment
encryption with the new key/IV and an entry in the playlist for the new key
-URI/IV.
+URI/IV if @code{hls_flags periodic_rekey} is enabled.
Key info file format:
@example
@@ -665,6 +665,11 @@ first segment's information.
@item omit_endlist
Do not append the @code{EXT-X-ENDLIST} tag at the end of the playlist.
+@item periodic_rekey
+The file specified by @code{hls_key_info_file} will be checked periodically and
+detect updates to the encryption info. Be sure to replace this file atomically,
+including the file containing the AES encryption key.
+
@item split_by_time
Allow segments to start on frames other than keyframes. This improves
behavior on some players when the time between keyframes is inconsistent,