Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'

Browse Source

* commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2':
  hlsenc: Add encryption support

This commit is a noop, see 907ac20aa2

Note that this commit differs from our encryption support in various
ways so it may need some adjustments in the future.

Merged-by: Clément Bœsch <u@pkh.me>

pull/258/head

Clément Bœsch 8 years ago

parent 68e3c9a3b6 0a4b9d0ccd

commit edc43c571d

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available