Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:32:51 +0000 (22:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Feb 2014 21:35:23 +0000 (22:35 +0100)
* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
  x86: add missing XOP checks and macros

Conflicts:
configure
libavutil/x86/cpu.h

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

Trivial merge