Merge commit '0a4b9d0c'

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

This commit is a noop, see 907ac20a

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>