[FFmpeg-cvslog] doc: remove codecpar mention in libav-merge.txt

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Sep 25 19:17:39 2016 +0200| [485f75b2786a8e6173e01345feea58b44aea2244] | committer: Clément Bœsch

doc: remove codecpar mention in libav-merge.txt

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

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4b2bb76..2011ae5 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -111,4 +111,3 @@ TODO/FIXME/UNMERGED
 ===================
 
 - HEVC DSP and x86 MC SIMD improvements from Libav (see http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917)
-- Porting ffmpeg*.c to codecpar (see bbf5ef9dac9475d8ed22da23acc2eb63a2640784)