Message ID | 20201209053922.91123-1-liuqi05@kuaishou.com |
---|---|
State | Accepted |
Commit | e6e341b2f04eb75a15f4839f3970544e67b19159 |
Headers | show |
Series | [FFmpeg-devel,v2] doc/muxers: correct description of hls_enc_key and hls_enc_iv | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | warning | Make fate failed |
LGTM. On 09-12-2020 11:09 am, liuqi05 wrote: > From: Steven Liu <liuqi05@kuaishou.com> > > because hls_enc_key and hls_enc_iv get 16byte char > for example: > -hls_enc_key 0123456789abcdef -hls_enc_iv abcdefghijklmnop > > Signed-off-by: liuqi05 <liuqi05@kuaishou.com> > --- > doc/muxers.texi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/doc/muxers.texi b/doc/muxers.texi > index 179b923951..8e12acaa28 100644 > --- a/doc/muxers.texi > +++ b/doc/muxers.texi > @@ -831,7 +831,7 @@ When enabled every segment generated is encrypted and the encryption key > is saved as @var{playlist name}.key. > > @item -hls_enc_key @var{key} > -Hex-coded 16byte key to encrypt the segments, by default it > +16-octet key to encrypt the segments, by default it > is randomly generated. > > @item -hls_enc_key_url @var{keyurl} > @@ -839,7 +839,7 @@ If set, @var{keyurl} is prepended instead of @var{baseurl} to the key filename > in the playlist. > > @item -hls_enc_iv @var{iv} > -Hex-coded 16byte initialization vector for every segment instead > +16-octet initialization vector for every segment instead > of the autogenerated ones. > > @item hls_segment_type @var{flags}
diff --git a/doc/muxers.texi b/doc/muxers.texi index 179b923951..8e12acaa28 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -831,7 +831,7 @@ When enabled every segment generated is encrypted and the encryption key is saved as @var{playlist name}.key. @item -hls_enc_key @var{key} -Hex-coded 16byte key to encrypt the segments, by default it +16-octet key to encrypt the segments, by default it is randomly generated. @item -hls_enc_key_url @var{keyurl} @@ -839,7 +839,7 @@ If set, @var{keyurl} is prepended instead of @var{baseurl} to the key filename in the playlist. @item -hls_enc_iv @var{iv} -Hex-coded 16byte initialization vector for every segment instead +16-octet initialization vector for every segment instead of the autogenerated ones. @item hls_segment_type @var{flags}