summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-07 22:37:15 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-08 03:25:17 +0200
commit3c3d4ce4fda1428f9b9fe05dbc9a201a8f10c1fb (patch)
treeeb3a9c9b3d86052e93505144838a400257c90efb /doc/libav-merge.txt
parent80a3227be624b475736ae765f57cb5f8c5f2373b (diff)
doc: fix bistream typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index da9e2757f5..82aea8e0df 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -97,7 +97,7 @@ Stuff that didn't reach the codebase:
- 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 bistream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html)
+- 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)
Collateral damage that needs work locally: