Merge commit '0ac1fec1'

* commit '0ac1fec1':
  bitstream: Move VLC reading functions into the vlc.h header
  vlc: Add header #include when the types are used

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: NJames Almer <jamrial@gmail.com>