Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 14:06:17 +0000 (16:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 14:06:22 +0000 (16:06 +0200)
* commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497':
  x86inc: FMA3/4 Support

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

Simple merge
Simple merge