Merge commit '30f0d1b997f15d667c05feab0b54f0b2814ba7a9'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 30518c0a6733793ba822b354be03bf28abf850d4..2040c6a0ce733bbd5d195569957ede18e1b45a94 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -98,6 +98,7 @@ Stuff that didn't reach the codebase:
 - Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html)
 - Use the new bitstream filter for extracting extradata (8e2ea69135 and 096a8effa3, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209068.html)
 - Read aac_adtstoasc extradata updates from packet side data on Matroska once mov and the bsf in question are fixed (See 13a211e632 and 5ef1959080)
+- new bistream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html)
 
 Collateral damage that needs work locally:
 ------------------------------------------
@@ -106,6 +107,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:
 ----------------------------------------------