[FFmpeg-cvslog] Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 23 22:42:43 2014 +0100| [d9574069c14a80944ae489b8a08876d123baa428] | committer: Michael Niedermayer

Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'

* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
  x86: add detection for FMA3 instruction set

Conflicts:
	configure
	libavutil/cpu.h
	libavutil/x86/cpu.c

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

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