RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Clément Bœsch 2017-04-03 20:36:31 +02:00
parent 478f1c3d5e 0b5a26e8bc
commit ee161dac9d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/libav-merge.txt
View File

@ -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:
------------------------------------------