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

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Sep 25 19:34:36 2016 +0200| [0fbd4239053208c6e7547d4c1a1d8d495598a00f] | committer: Clément Bœsch

doc/libav-merge: complete TODO section

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fbd4239053208c6e7547d4c1a1d8d495598a00f
---

 doc/libav-merge.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index d7936f9..26eb87c 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 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