libvpx: Pull from upstream

libvpx_srcs_x86_intrinsics.gypi

Index: libvpx_srcs_x86_intrinsics.gypi
diff --git a/libvpx_srcs_x86_intrinsics.gypi b/libvpx_srcs_x86_intrinsics.gypi
index ecf9fb7e810adc6d1150e21eac0cd2ebfc4f9564..803720f334c508a14609f9c201d893835d3c87c8 100644
--- a/libvpx_srcs_x86_intrinsics.gypi
+++ b/libvpx_srcs_x86_intrinsics.gypi
@@ -16,6 +16,7 @@
         '<(libvpx_source)/vp8/common/x86/idct_blk_mmx.c',
         '<(libvpx_source)/vp8/common/x86/variance_mmx.c',
         '<(libvpx_source)/vp8/encoder/x86/vp8_enc_stubs_mmx.c',
+        '<(libvpx_source)/vpx_dsp/x86/variance_mmx.c',
       ],
       'cflags': [ '-mmmx', ],
       'xcode_settings': { 'OTHER_CFLAGS': [ '-mmmx' ] },
@@ -37,12 +38,11 @@
         '<(libvpx_source)/vp9/common/x86/vp9_idct_intrin_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_loopfilter_intrin_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_avg_intrin_sse2.c',
-        '<(libvpx_source)/vp9/encoder/x86/vp9_dct32x32_sse2.c',
-        '<(libvpx_source)/vp9/encoder/x86/vp9_dct_impl_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_dct_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_denoiser_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_quantize_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_variance_sse2.c',
+        '<(libvpx_source)/vpx_dsp/x86/variance_sse2.c',
       ],
       'cflags': [ '-msse2', ],
       'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] },
@@ -104,14 +104,14 @@
       'sources': [
         '<(libvpx_source)/vp9/common/x86/vp9_loopfilter_intrin_avx2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c',
-        '<(libvpx_source)/vp9/encoder/x86/vp9_dct32x32_avx2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_dct_avx2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_error_intrin_avx2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_variance_avx2.c',
-        '<(libvpx_source)/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c',
         '<(libvpx_source)/vpx_dsp/x86/sad4d_avx2.c',
         '<(libvpx_source)/vpx_dsp/x86/sad_avx2.c',
+        '<(libvpx_source)/vpx_dsp/x86/variance_avx2.c',
+        '<(libvpx_source)/vpx_dsp/x86/variance_impl_avx2.c',
       ],
       'cflags': [ '-mavx2', ],
       'xcode_settings': { 'OTHER_CFLAGS': [ '-mavx2' ] },