Merge commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e'
authorClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:19:29 +0000 (11:19 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:19:29 +0000 (11:19 +0200)
* commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e':
  dxtory: Convert to the new bitstream reader
  apedec: Convert to the new bitstream reader

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

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge