falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2' 

* 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>
tags/n3.3
Clément Bœsch 8 years ago
parent
68e3c9a3b6 0a4b9d0ccd
commit
edc43c571d
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available