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)
commit9c22aedd265ef38dc240d107171eb846fdef744a
tree7ce15d4eb18d5d382a065f3bd815d04f06897018
parent1907e19d0ce2ad752912d73b798ebf4494aa1b1c
parent44b44441203177690305c294be6eff8d9c668954
Merge commit '44b44441203177690305c294be6eff8d9c668954'

* commit '44b44441203177690305c294be6eff8d9c668954':
  x86inc: Various minor backports from x264

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