[FFmpeg-cvslog] doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 15:31:50 2017 -0300| [183635b9e96be0f4864e9e441b0aa93e8761b0ea] | committer: James Almer

doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska

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

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 9c904c3..34d512b 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -98,6 +98,7 @@ 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)
 - Use the new bitstream filter for extracting extradata (see 8e2ea69135 and 096a8effa3)
 - ADD_RES_MMX_4_8 in libavcodec/x86/hevc_add_res.asm probably needs updating (see 589880710)
+- Read aac_adtstoasc extradata updates from packet side data on Matroska once mov and the bsf in question are fixed (See 13a211e632 and 5ef1959080)
 
 Collateral damage that needs work locally:
 ------------------------------------------