Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'
authorClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:36:31 +0000 (20:36 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 3 Apr 2017 18:38:28 +0000 (20:38 +0200)
commitee161dac9dccf93fc9dff98da6af00711ec7556c
treee5d6f1a45f3ec7fdf152245cae29334cdc80a960
parent478f1c3d5e5463a284ea7efecfc62d47ba3be11a
parent0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9
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>
doc/libav-merge.txt