[FFmpeg-cvslog] doc/libav-merge: remove the hls merge TODO

[Steven Liu]

ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Fri Aug  4 22:18:22 2017 +0800| [44e9783ab9a1a26d718a9360adfb528d5015df6e] | committer: Steven Liu

doc/libav-merge: remove the hls merge TODO

This TODO is done.
See 5caaa3a49e76b084ff8a9840d541bad64d96d7f7

Reviewed-by: Clément Bœsch <u at pkh.me>
Signed-off-by: Steven Liu <lq at onvideo.cn>

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

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 690c4ef97f..96b008b71b 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -105,7 +105,6 @@ Collateral damage that needs work locally:
 - Merge proresdec2.c and proresdec_lgpl.c
 - Merge proresenc_anatoliy.c and proresenc_kostya.c
 - Fix MIPS AC3 downmix
-- hlsenc encryption support may need some adjustment (see edc43c571d)
 
 Extra changes needed to be aligned with Libav:
 ----------------------------------------------