[FFmpeg-cvslog] doc/libav-merge: document hlsenc encryption state

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 18:21:11 2017 +0200| [a3fc5f535adc7f684babee02772b7fdfc090abca] | committer: Clément Bœsch

doc/libav-merge: document hlsenc encryption state

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3fc5f535adc7f684babee02772b7fdfc090abca
---

 doc/libav-merge.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 30518c0..2b63238 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -106,6 +106,7 @@ Collateral damage that needs work locally:
 - Merge proresenc_anatoliy.c and proresenc_kostya.c
 - Remove ADVANCED_PARSER in libavcodec/hevc_parser.c
 - Fix MIPS AC3 downmix
+- hlsenc encryption support may need some adjustment (see edc43c571d)
 
 Extra changes needed to be aligned with Libav:
 ----------------------------------------------