libvpx: Pull from upstream

libvpx_srcs_x86_intrinsics.gypi

Index: libvpx_srcs_x86_intrinsics.gypi
===================================================================
--- libvpx_srcs_x86_intrinsics.gypi	(revision 191886)
+++ libvpx_srcs_x86_intrinsics.gypi	(working copy)
@@ -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)/vp9/common/x86/vp9_loopfilter_intrin_mmx.c',
       ],
       'conditions': [
         ['os_posix==1 and OS!="mac"', {
@@ -43,7 +44,9 @@
         '<(libvpx_source)/vp8/encoder/x86/quantize_sse2.c',
         '<(libvpx_source)/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_filter_sse2.c',
+        '<(libvpx_source)/vp9/common/x86/vp9_loopfilter_intrin_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_recon_wrapper_sse2.c',
+        '<(libvpx_source)/vp9/common/x86/vp9_sadmxn_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_subpixel_variance_sse2.c',
         '<(libvpx_source)/vp9/decoder/x86/vp9_idct_blk_sse2.c',
       ],
@@ -120,32 +123,5 @@
         }],
       ],
     },
-    {
-      'target_name': 'libvpx_intrinsics_extra',
-      'type': 'static_library',
-      'include_dirs': [
-        'source/config/<(OS_CATEGORY)/<(target_arch)',
-        '<(libvpx_source)',
-      ],
-      'sources': [
-        '<(libvpx_source)/vp8/common/x86/filter_x86.c',
-        '<(libvpx_source)/vp8/common/x86/loopfilter_x86.c',
-        '<(libvpx_source)/vp8/common/x86/postproc_x86.c',
-        '<(libvpx_source)/vp8/common/x86/vp8_asm_stubs.c',
-        '<(libvpx_source)/vp9/common/x86/vp9_asm_stubs.c',
-        '<(libvpx_source)/vp9/common/x86/vp9_loopfilter_x86.c',
-        '<(libvpx_source)/vp9/common/x86/vp9_sadmxn_x86.c',
-      ],
-      'conditions': [
-        ['os_posix==1 and OS!="mac"', {
-          'cflags': [ '-msse4.1', ],
-        }],
-        ['OS=="mac"', {
-          'xcode_settings': {
-            'OTHER_CFLAGS': [ '-msse4.1', ],
-          },
-        }],
-      ],
-    },
   ],
 }