Merge commit '1b2412f50185447da4212f65f06e8d72a6daf06e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:17:50 +0000 (15:17 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:17:50 +0000 (15:17 +0200)
* commit '1b2412f50185447da4212f65f06e8d72a6daf06e':
  lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge