Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Jan 2017 18:20:54 +0000 (15:20 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Jan 2017 18:20:54 +0000 (15:20 -0300)
commit8d5df204d002bef25aadc4d7667e32c4fecaa2b7
treef2a4230cae582daf8e90dd54632b50dc316afe97
parent2eab48177d74782cf948e7ae13aef2ee5d7ab1c1
parent8e9cd81d291b1010c625b2766058aadf4affb537
Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'

* commit '8e9cd81d291b1010c625b2766058aadf4affb537':
  x86: cpu: Detect Conroe CPUs and their slow shuffle unit

Merged-by: James Almer <jamrial@gmail.com>
libavutil/x86/cpu.c