Merge commit 'd0ce0634e09403eecaea4283cf82a2c5cea7d1e1'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 18:51:41 +0000 (15:51 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 18:51:41 +0000 (15:51 -0300)
commit63f82ab3897b7b01252a7f8b377887622ebaa024
tree4f4b52215586272832a14f5db25c148b34216e93
parent269ed71e93a4eb96cbdf3720311708fb613999d1
parentd0ce0634e09403eecaea4283cf82a2c5cea7d1e1
Merge commit 'd0ce0634e09403eecaea4283cf82a2c5cea7d1e1'

* commit 'd0ce0634e09403eecaea4283cf82a2c5cea7d1e1':
  clearvideo: Convert to the new bitstream reader

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: James Almer <jamrial@gmail.com>