Merge commit '44b44441203177690305c294be6eff8d9c668954'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:01:35 +0000 (09:01 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:01:35 +0000 (09:01 +0200)
* commit '44b44441203177690305c294be6eff8d9c668954':
  x86inc: Various minor backports from x264

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

Trivial merge