diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-03 20:36:31 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-03 20:38:28 +0200 |
| commit | ee161dac9dccf93fc9dff98da6af00711ec7556c (patch) | |
| tree | e5d6f1a45f3ec7fdf152245cae29334cdc80a960 /doc/libav-merge.txt | |
| parent | 478f1c3d5e5463a284ea7efecfc62d47ba3be11a (diff) | |
| parent | 0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9 (diff) | |
Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'
* commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9': (35 commits)
qdm2: Convert to the new bitstream reader
qcelp: Convert to the new bitstream reader
pcx: Convert to the new bitstream reader
opus: Convert to the new bitstream reader
nellymoser: Convert to the new bitstream reader
jvdec: Convert to the new bitstream reader
hqx: Convert to the new bitstream header
hq_hqa: Convert to the new bitstream reader
gsm: Convert to the new bitstream reader
g72x: Convert to the new bitstream reader
g2meet: Convert to the new bitstream reader
fraps: Convert to the new bitstream reader
flashsv: Convert to the new bitstream reader
faxcompr: Convert to the new bitstream reader
exr: Convert to the new bitstream reader
escape130: Convert to the new bitstream reader
escape124: Convert to the new bitstream reader
dvdsubdec: Convert to the new bitstream reader
dss_sp: Convert to the new bitstream reader
cook: Convert to the new bitstream reader
...
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'doc/libav-merge.txt')
| -rw-r--r-- | doc/libav-merge.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 2b632381af..2040c6a0ce 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -98,6 +98,7 @@ Stuff that didn't reach the codebase: - 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) Collateral damage that needs work locally: ------------------------------------------ |