Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Aug 2013 09:57:29 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Aug 2013 09:57:35 +0000 (11:57 +0200)
commitf0a35623826e367fb1534c68222bfd4918e58a0f
tree43e7bc95c1fc15bdadd34fa0646268fcd6f438ee
parent01a82f1dc544df7a4affb3858d12b7b2e492cbba
parent79aec43ce813a3e270743ca64fa3f31fa43df80b
Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b':
  x86: Add and use more convenience macros to check CPU extension availability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/cpu.h
libswscale/utils.c