doc/libav-merge: complete TODO section

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index d7936f9..26eb87c 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -84,4 +84,14 @@ whitespace differences) are passed into colordiff.
 TODO/FIXME/UNMERGED
 ===================
 
+Stuff that didn't reach the codebase:
+-------------------------------------
+
 - HEVC DSP and x86 MC SIMD improvements from Libav (see https://ffmpeg.org/pipermail/ffmpeg-devel/2015-December/184777.html)
+
+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