Merge commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 18:06:10 +0000 (15:06 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 18:06:10 +0000 (15:06 -0300)
commit475ff3ec2487c7a2e3a835755cbb0fdc97daacb8
tree4293101789a828c1aeee30c4988158d4d65fcf6d
parent7289c7658a1ae32a59b26fac6b93791524f00dcb
parentab2539bd374fe7ddbc6e2f058b62645cd5076192
Merge commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192'

* commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192':
  ffv1: Convert to the new bitstream reader
  h261dec: Convert to the new bitstream reader
  shorten: Convert to the new bitstream reader
  ralf: Convert to the new bitstream reader
  loco: Convert to the new bitstream reader
  fic: Convert to the new bitstream reader
  dirac: Convert to the new bitstream reader
  cavs: Convert to the new bitstream reader
  aic: Convert to the new bitstream reader
  golomb: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>