ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat Apr 1 18:17:02 2017 +0200| [edc43c571d66b07315f99d00b5ada667fc77b932] | committer: Clément Bœsch
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 <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edc43c571d66b07315f99d00b5ada667fc77b932 --- _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
