Merge commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:04:14 +0000 (23:04 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:04:14 +0000 (23:04 +0200)
commiteebea62671b64e317bfd1a0670287e7d1b85fb04
tree1611316e9a549e742219822c85dc72db7e92eae6
parentd307c44bafc67ffa5c05c49148d994e64266d3b9
parent49d7fcd774ac31f242818ad9d45d9c013f3bb3db
Merge commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db'

* commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db':
  mpeg12: Unbreak building stale code

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