[FFmpeg-cvslog] doc/libav-merge: create a special "extra changes" section

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 22 11:42:42 2017 +0100| [ce10e4cb1f21d1ef65ab679f5beb88842f971357] | committer: Clément Bœsch

doc/libav-merge: create a special "extra changes" section

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

 doc/libav-merge.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index e94a749..03b433f 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -95,7 +95,6 @@ Stuff that didn't reach the codebase:
   - 0cef06df0 checkasm: add HEVC MC tests
   - e7078e842 hevcdsp: add x86 SIMD for MC
 - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348)
-- Switching examples to the new encode/decode API (see 67d28f4a0f)
 
 Collateral damage that needs work locally:
 ------------------------------------------
@@ -103,3 +102,9 @@ 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
+
+Extra changes needed to be aligned with Libav:
+----------------------------------------------
+
+- Switching our examples to the new encode/decode API (see 67d28f4a0f)
+- AC3 speed-up for our fixed version (see a9ba59591e)