[FFmpeg-cvslog] doc/libav-merge: remove line about aac_adtstoasc

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed May 24 19:46:30 2017 -0300| [94ec89eb6732c2eb663dfe2f8c2a38d82df2ffbf] | committer: James Almer

doc/libav-merge: remove line about aac_adtstoasc

Signed-off-by: James Almer <jamrial at gmail.com>

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

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 5ae7ce855b..85c672adb3 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -96,7 +96,6 @@ Stuff that didn't reach the codebase:
   - 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)
 - 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 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)