Merge commit 'c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 20:13:46 +0000 (17:13 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 20:13:46 +0000 (17:13 -0300)
commita901869c19ed14c7d3647901468bd1297c9f98c0
tree910bb922f6b046166d94d38209c8f35c659b62fc
parent3f9e7ddd90d324a2876f96d5e19a403f78995f70
parentc29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068
Merge commit 'c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068'

* commit 'c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068':
  svq3: 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>