X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=doc%2Flibav-merge.txt;h=96b008b71b2081d0737ee4b06e62cd6bd0df05ee;hb=e4fd7b1fea7e2d3306f159d285ea420a1f250dcc;hp=6f052ec2eb4593862fa5c0add02be74550671338;hpb=bf0fde84d503280009e6f573ded2e43eae80901b;p=ffmpeg

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 6f052ec2eb4..96b008b71b2 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -96,8 +96,7 @@ Stuff that didn't reach the codebase:
   - e7078e842 hevcdsp: add x86 SIMD for MC
 - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348)
 - Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.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)
+- new bitstream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html)
 - use of the bsf instead of our parser for vp9 superframes (see fa1749dd34)
 
 Collateral damage that needs work locally:
@@ -105,9 +104,7 @@ Collateral damage that needs work locally:
 
 - Merge proresdec2.c and proresdec_lgpl.c
 - 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:
 ----------------------------------------------