[FFmpeg-cvslog] doc/libav-merge: add a line about the extract_extradata commits

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 19:49:09 2017 -0300| [0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb] | committer: James Almer

doc/libav-merge: add a line about the extract_extradata commits

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

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

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4cb3e6e..d57b79a 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -96,6 +96,7 @@ 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)
+- Use the new bitstream filter for extracting extradata (see 8e2ea69135 and 096a8effa3)
 
 Collateral damage that needs work locally:
 ------------------------------------------