summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-04-07 17:31:13 -0300
committerJames Almer <jamrial@gmail.com>2017-04-07 17:31:40 -0300
commit3f8d7342c32c8b22ab177d62f5c7660db213e342 (patch)
tree5cba2fbad95e23cb3d67e5dc17078a8e881957dc /doc/libav-merge.txt
parente7fb6bc32d1bbffbc1a466c2a505b138cf8a7e0e (diff)
downloadffmpeg-3f8d7342c32c8b22ab177d62f5c7660db213e342.tar.gz
doc/libav-merge: remove line about extract_extradata_bsf usage
It was addressed in b8f26779d615dfb466e90627323b1a4e40639f76
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 2040c6a0ce..454f4549ff 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)
-- Use the new bitstream filter for extracting extradata (8e2ea69135 and 096a8effa3, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209068.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 bistream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html)