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)
* commit '8e9cd81d291b1010c625b2766058aadf4affb537':
  x86: cpu: Detect Conroe CPUs and their slow shuffle unit

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

Simple merge