summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 30518c0a67..2b632381af 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:
----------------------------------------------