diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-01 18:17:02 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-01 18:20:10 +0200 |
| commit | edc43c571d66b07315f99d00b5ada667fc77b932 (patch) | |
| tree | 2468785503c607657ebf87a759d629917332c49c | |
| parent | 68e3c9a3b680ffdc5ea4961090d8d7ec3efbdb1f (diff) | |
| parent | 0a4b9d0ccd10b3c39105f99bd320f696f69a75a2 (diff) | |
| download | ffmpeg-edc43c571d66b07315f99d00b5ada667fc77b932.tar.gz | |
Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'
* commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2':
hlsenc: Add encryption support
This commit is a noop, see 907ac20aa29341e49a4f89ff3d4240d92f9a0cb9
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>
0 files changed, 0 insertions, 0 deletions