Commit 09824332 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '10b0161d'

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

Conflicts:
	configure
	libavutil/x86/cpu.h

See: 6c12b1deMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 38336f0f 10b0161d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment