summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-23 19:49:09 -0300
committerJames Almer <jamrial@gmail.com>2017-03-23 19:49:09 -0300
commit0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb (patch)
tree912c23c782aa444b3bfcfc1ad8ae593889ce8d83 /doc/libav-merge.txt
parent950c3fa52097efbfa76b5f7311750fe681df673c (diff)
doc/libav-merge: add a line about the extract_extradata commits
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4cb3e6e9ba..d57b79a236 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:
------------------------------------------