avcodec/vc1: remove unused ff_vc1_loop_filter_iblk

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4ba08fc588f9e4508b9292cc5874bc386fe5c25d..8c182ae78d65c6a4cf8b50cc965e13db292d105a 100644 (file)
--- 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