Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'

* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
  x86: add missing XOP checks and macros

Conflicts:
	configure
	libavutil/x86/cpu.h

See: 6c12b1de06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-23 22:32:51 +01:00
commit 0982433253

Diff Content Not Available