[FFmpeg-cvslog] Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jan 31 15:20:54 2017 -0300| [8d5df204d002bef25aadc4d7667e32c4fecaa2b7] | committer: James Almer

Merge commit '8e9cd81d291b1010c625b2766058aadf4affb537'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d5df204d002bef25aadc4d7667e32c4fecaa2b7
---

 libavutil/x86/cpu.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index f3a49c6..1b80847 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -221,6 +221,12 @@ int ff_get_cpu_flags_x86(void)
          * functions on the Atom. */
         if (family == 6 && model == 28)
             rval |= AV_CPU_FLAG_ATOM;
+
+        /* Conroe has a slow shuffle unit. Check the model number to ensure not
+         * to include crippled low-end Penryns and Nehalems that lack SSE4. */
+        if ((rval & AV_CPU_FLAG_SSSE3) && !(rval & AV_CPU_FLAG_SSE4) &&
+            family == 6 && model < 23)
+            rval |= AV_CPU_FLAG_SSSE3SLOW;
     }
 
 #endif /* cpuid */


======================================================================