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)
commite5630ce5b122b058e6a510ad841b678eb7c5ae76
treed7ea99a6de25a30476acffab592ce35a8afe70f1
parent584366a4365746350bbe7e8acaf0a0689618deab
parentfd8de7f2d8c31195d309247cb129c0ad787ef76e
Merge commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e'

* 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>