Merge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 02:52:22 +0000 (23:52 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 02:52:22 +0000 (23:52 -0300)
commita1dcb057e3dc0b19fd0d82745ae7ab4ccdf6a43f
treee5f301a7aed89a260f2e729331e20eea16dd1388
parente9a388061371d35a949106c627018122ad07eb04
parent9c2d36fcaf8748b9baa9aba9264abefce711d67b
Merge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'

* commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b':
  dv: 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>