Merge commit 'f7ec7f546f0021d28da284b024416b916b61c974'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 22:18:56 +0000 (19:18 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 22:18:56 +0000 (19:18 -0300)
* commit 'f7ec7f546f0021d28da284b024416b916b61c974':
  wma: 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>

Trivial merge