Merge commit '4efab89332ea39a77145e8b15562b981d9dbde68'

* commit '4efab89332ea39a77145e8b15562b981d9dbde68':
  x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate

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

diff --cc libavcodec/x86/ac3dsp_init.c
Simple merge

diff --cc libavcodec/x86/h264_qpel.c
Simple merge

diff --cc libavcodec/x86/lpc.c
index 3a9493f72842045212224170c9b845f3607fcae0,e8cce42af49390fa5c4ea863a7579d98f9c2ca98..6c72e21bacf2ab88e18fd87559d3ea4d4fc0d5d6
--- 1/libavcodec/x86/lpc.c
--- 2/libavcodec/x86/lpc.c
+++ b/libavcodec/x86/lpc.c
@@@ -154,7 -152,7 +154,7 @@@ av_cold void ff_lpc_init_x86(LPCContex
  #if HAVE_SSE2_INLINE
      int cpu_flags = av_get_cpu_flags();
  
-     if (HAVE_SSE2_INLINE && cpu_flags & (AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_SSE2SLOW)) {
 -    if (INLINE_SSE2_SLOW(cpu_flags)) {
++    if (INLINE_SSE2(cpu_flags) || INLINE_SSE2_SLOW(cpu_flags)) {
          c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
          c->lpc_compute_autocorr   = lpc_compute_autocorr_sse2;
      }

diff --cc libavcodec/x86/vp8dsp_init.c
index 897d5a0e77c88fd71dc95141ae68b551e37eec57,3e84bed424ed7ad79b24e832e9c1d268af2262e8..20c5fac0c0300e32c8a13f5d6622ab0953e25f82
--- 1/libavcodec/x86/vp8dsp_init.c
--- 2/libavcodec/x86/vp8dsp_init.c
+++ b/libavcodec/x86/vp8dsp_init.c
@@@ -346,7 -346,7 +346,7 @@@ av_cold void ff_vp78dsp_init_x86(VP8DSP
          c->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_sse;
      }
  
-     if (HAVE_SSE2_EXTERNAL && cpu_flags & (AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_SSE2SLOW)) {
 -    if (EXTERNAL_SSE2_SLOW(cpu_flags)) {
++    if (EXTERNAL_SSE2(cpu_flags) || EXTERNAL_SSE2_SLOW(cpu_flags)) {
          VP8_LUMA_MC_FUNC(0, 16, sse2);
          VP8_MC_FUNC(1, 8, sse2);
          VP8_BILINEAR_MC_FUNC(0, 16, sse2);
@@@ -416,7 -416,7 +416,7 @@@ av_cold void ff_vp8dsp_init_x86(VP8DSPC
          c->vp8_luma_dc_wht                      = ff_vp8_luma_dc_wht_sse;
      }
  
-     if (HAVE_SSE2_EXTERNAL && cpu_flags & (AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_SSE2SLOW)) {
 -    if (EXTERNAL_SSE2_SLOW(cpu_flags)) {
++    if (EXTERNAL_SSE2(cpu_flags) || EXTERNAL_SSE2_SLOW(cpu_flags)) {
          c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_sse2;
  
          c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_sse2;