Merge commit '0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 21:10:06 +0000 (18:10 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 21:10:06 +0000 (18:10 -0300)
commitff173ce8f1a8d043ce87c02a017ec55bb51b2297
tree31b0b58b1fdd7222f8e50ad10055b02d1f3785dc
parent31a4112936196c5668c84c24acadf710244e8e72
parent0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c
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@gmail.com>