Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:42:43 +0000 (22:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:43:08 +0000 (22:43 +0100)
* 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@gmx.at>
1  2 
libavutil/x86/cpu.c

Simple merge