Merge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 21:59:18 +0000 (23:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 21:59:48 +0000 (23:59 +0200)
* commit 'cae39851201b7781f1262e1c23627b45e6e80bb4':
  x86: Add helper macros to check for slow cpuflags

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

Simple merge
Simple merge