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)
* commit '206895708ea2b464755d340e44501daf9a07c310':
  x86inc: Remove our FMA4 support

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

Simple merge
Simple merge
Simple merge