[FFmpeg-cvslog] Merge commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 18:10:06 2017 -0300| [ff173ce8f1a8d043ce87c02a017ec55bb51b2297] | committer: James Almer

Merge commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c'

* commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c':
  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.html

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

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