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)
* commit '71155665414b551ad350622d5abed20e58371fbf':
  x86inc: various minor backports from x264

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

Simple merge