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)
commit0e56321aef0b5c5a0e9f7a34f019b2e478319661
tree161751b19dd445632159150449f16c51359797cc
parent0c224ce231c8c9a3494b21f9b3155ed18dc3e4cf
parentf7ec7f546f0021d28da284b024416b916b61c974
Merge commit 'f7ec7f546f0021d28da284b024416b916b61c974'

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