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)
commite3e0e3d0c913a55fd616d3c431859564dc0e9b79
tree07e6759f4bf1a3472bc7258e6cf1192cce4292fb
parent9ac124c889a6b3a8472f3bdfda2c379cb4ddaefa
parentc6908d6b4b377a04a5d055ba874bdbcf06c80497
Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'

* commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497':
  x86inc: FMA3/4 Support

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