Merge commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:14:32 +0000 (14:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:15:10 +0000 (14:15 +0200)
* commit '8410d6e93c2e074881f1c7b7e4cdefd2e497d52e':
  avutil: Refactor CPU extension availability macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/cpu_internal.h
libavutil/x86/cpu.h

Simple merge
Simple merge