avcodec: add Gremlin Digital Video decoder

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 85c672adb30ac55c2f6c04b690920715f259de5f..690c4ef97f222b0a538ab0d564add2eb1d4c6f76 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -98,11 +98,6 @@ Stuff that didn't reach the codebase:
 - Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html)
 - new bitstream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html)
 - use of the bsf instead of our parser for vp9 superframes (see fa1749dd34)
-- use of the new AVFrame crop fields in h264/hevc/theora (see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-May/211239.html)
-  - a02ae1c683 hevcdec: export cropping information instead of handling it internally
-  - 4fded0480f h264dec: be more explicit in handling container cropping
-  - c3e84820d6 h264dec: export cropping information instead of handling it internally
-  - 1202b71269 theora: export cropping information instead of handling it internally
 
 Collateral damage that needs work locally:
 ------------------------------------------