[FFmpeg-devel] [PATCH] doc/libav-merge: complete TODO section

[Clément Bœsch]

---
What else is missing?
---
 doc/libav-merge.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4fd863e..e200bdb 100644
--- 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 http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917)
+
+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
-- 
2.10.0