[FFmpeg-cvslog] Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 12 12:04:31 2012 +0100| [8c0a14d221af1add009829d65a5beb0e5d5d8770] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c0a14d221af1add009829d65a5beb0e5d5d8770
---