Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:36:20 +0000 (02:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:36:36 +0000 (02:36 +0200)
commita6657044021527c8d8e5341199bded0e1b7eaec0
treef4dac419d3b249da2cb446111b609f575b82a1e1
parent865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
parent4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4
Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
  libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c