summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2016-09-25 19:17:39 +0200
committerClément Bœsch <u@pkh.me>2016-09-25 19:17:39 +0200
commit485f75b2786a8e6173e01345feea58b44aea2244 (patch)
tree4313f39395ade5bcbfe04244bcf90edd3d4fb0a2 /doc
parent99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9 (diff)
downloadffmpeg-485f75b2786a8e6173e01345feea58b44aea2244.tar.gz
doc: remove codecpar mention in libav-merge.txt
Diffstat (limited to 'doc')
-rw-r--r--doc/libav-merge.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4b2bb76471..2011ae580c 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)