[FFmpeg-cvslog] doc/libav-merge: remove resolved item

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Apr 28 14:15:41 2018 +0200| [c116ba375ea485adeda8fd0e7b81b5d9ca4c7d4a] | committer: Paul B Mahol

doc/libav-merge: remove resolved item

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 doc/libav-merge.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4ba08fc588..8c182ae78d 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -105,7 +105,6 @@ Stuff that didn't reach the codebase:
 Collateral damage that needs work locally:
 ------------------------------------------
 
-- Merge proresdec2.c and proresdec_lgpl.c
 - Merge proresenc_anatoliy.c and proresenc_kostya.c
 - Fix MIPS AC3 downmix