[FFmpeg-cvslog] Merge commit 'f7ec7f546f0021d28da284b024416b916b61c974'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 26 19:18:56 2017 -0300| [0e56321aef0b5c5a0e9f7a34f019b2e478319661] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e56321aef0b5c5a0e9f7a34f019b2e478319661
---