Merge commit '71155665414b551ad350622d5abed20e58371fbf'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:57:33 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:57:39 +0000 (11:57 +0200)
commit31d9aa6b2e1a69379ebf1cf1b5449ff1bd98e0fa
tree7034eb90801fd04f7e1a14823a7aebce5de10a0b
parent3f965ab95d94ee39c70b4711a8680f41575996c1
parent71155665414b551ad350622d5abed20e58371fbf
Merge commit '71155665414b551ad350622d5abed20e58371fbf'

* commit '71155665414b551ad350622d5abed20e58371fbf':
  x86inc: various minor backports from x264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/x86inc.asm