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)
commit73e9f04ea5e80e7b99420ec4bbf6995430146ff8
tree5e189d38e934195af053156da8d2fe2c7c74f681
parent95f92b2513342d3122320de6f80ebf8e55a91728
parent1b2412f50185447da4212f65f06e8d72a6daf06e
Merge commit '1b2412f50185447da4212f65f06e8d72a6daf06e'

* commit '1b2412f50185447da4212f65f06e8d72a6daf06e':
  lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video

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