Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 11:04:31 +0000 (12:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Nov 2012 11:18:26 +0000 (12:18 +0100)
commit8c0a14d221af1add009829d65a5beb0e5d5d8770
treee8efab14cdede3d6a84265c4873ad547ee704bf5
parent03b078721c8e42c413da75f553e740d235092dad
parent2b479bcab0a8365a7c094c5fa44b8cb6da9810d0
Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'

These patches have not been merged at the request of Carl

* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
  build: Drop AVX assembly ifdefs
  x86: Require an assembler able to cope with AVX instructions

Conflicts:
libavcodec/x86/fft.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>