diff options
| author | James Almer <jamrial@gmail.com> | 2017-05-24 19:46:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-24 20:28:01 -0300 |
| commit | 94ec89eb6732c2eb663dfe2f8c2a38d82df2ffbf (patch) | |
| tree | 9994b13c067d8eea971f501ce9887c0c5a084957 /doc/libav-merge.txt | |
| parent | f1cdc01e7208f9e05cd92127003b3b494ec10cfb (diff) | |
| download | ffmpeg-94ec89eb6732c2eb663dfe2f8c2a38d82df2ffbf.tar.gz | |
doc/libav-merge: remove line about aac_adtstoasc
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc/libav-merge.txt')
| -rw-r--r-- | doc/libav-merge.txt | 1 |
1 files changed, 0 insertions, 1 deletions
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) |