X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=doc%2Flibav-merge.txt;h=5ae7ce855b00b6ed16c04a9b89ab5a3e4598786c;hb=f225003d17364cd38fd28f268ae2b29abd8e5024;hp=454f4549fff115157216724370114e1fead4a77b;hpb=3390a2be9deb1ce2bb10163106f1ba8e4ea8ad04;p=android-x86%2Fexternal-ffmpeg.git

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 454f4549ff..5ae7ce855b 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -97,14 +97,19 @@ Stuff that didn't reach the codebase:
 - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348)
 - Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html)
 - Read aac_adtstoasc extradata updates from packet side data on Matroska once mov and the bsf in question are fixed (See 13a211e632 and 5ef1959080)
-- new bistream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.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:
 ------------------------------------------
 
 - Merge proresdec2.c and proresdec_lgpl.c
 - Merge proresenc_anatoliy.c and proresenc_kostya.c
-- Remove ADVANCED_PARSER in libavcodec/hevc_parser.c
 - Fix MIPS AC3 downmix
 - hlsenc encryption support may need some adjustment (see edc43c571d)