Merge commit '206895708ea2b464755d340e44501daf9a07c310'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 13:53:46 +0000 (15:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 13:54:23 +0000 (15:54 +0200)
commit9ac124c889a6b3a8472f3bdfda2c379cb4ddaefa
tree208aaba8c3b9eca0b79218520a559657cdd88acf
parent12e4493f9c143f34e733a959059cea1a2ac664c5
parent206895708ea2b464755d340e44501daf9a07c310
Merge commit '206895708ea2b464755d340e44501daf9a07c310'

* commit '206895708ea2b464755d340e44501daf9a07c310':
  x86inc: Remove our FMA4 support

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