libvpx: Pull from upstream

libvpx_srcs_x86_64.gypi

Index: libvpx_srcs_x86_64.gypi
===================================================================
--- libvpx_srcs_x86_64.gypi	(revision 278778)
+++ libvpx_srcs_x86_64.gypi	(working copy)
@@ -46,7 +46,6 @@
     '<(libvpx_source)/vp8/common/postproc.c',
     '<(libvpx_source)/vp8/common/postproc.h',
     '<(libvpx_source)/vp8/common/ppflags.h',
-    '<(libvpx_source)/vp8/common/pragmas.h',
     '<(libvpx_source)/vp8/common/quant_common.c',
     '<(libvpx_source)/vp8/common/quant_common.h',
     '<(libvpx_source)/vp8/common/reconinter.c',
@@ -74,14 +73,13 @@
     '<(libvpx_source)/vp8/common/x86/idctllm_sse2.asm',
     '<(libvpx_source)/vp8/common/x86/iwalsh_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/iwalsh_sse2.asm',
-    '<(libvpx_source)/vp8/common/x86/loopfilter_block_sse2.asm',
+    '<(libvpx_source)/vp8/common/x86/loopfilter_block_sse2_x86_64.asm',
     '<(libvpx_source)/vp8/common/x86/loopfilter_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/loopfilter_sse2.asm',
     '<(libvpx_source)/vp8/common/x86/loopfilter_x86.c',
     '<(libvpx_source)/vp8/common/x86/mfqe_sse2.asm',
     '<(libvpx_source)/vp8/common/x86/postproc_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/postproc_sse2.asm',
-    '<(libvpx_source)/vp8/common/x86/postproc_x86.c',
     '<(libvpx_source)/vp8/common/x86/recon_mmx.asm',
     '<(libvpx_source)/vp8/common/x86/recon_sse2.asm',
     '<(libvpx_source)/vp8/common/x86/sad_mmx.asm',
@@ -159,8 +157,7 @@
     '<(libvpx_source)/vp8/encoder/x86/encodeopt.asm',
     '<(libvpx_source)/vp8/encoder/x86/fwalsh_sse2.asm',
     '<(libvpx_source)/vp8/encoder/x86/quantize_mmx.asm',
-    '<(libvpx_source)/vp8/encoder/x86/quantize_sse4.asm',
-    '<(libvpx_source)/vp8/encoder/x86/ssim_opt.asm',
+    '<(libvpx_source)/vp8/encoder/x86/ssim_opt_x86_64.asm',
     '<(libvpx_source)/vp8/encoder/x86/subtract_mmx.asm',
     '<(libvpx_source)/vp8/encoder/x86/subtract_sse2.asm',
     '<(libvpx_source)/vp8/vp8_cx_iface.c',
@@ -196,7 +193,6 @@
     '<(libvpx_source)/vp9/common/vp9_mvref_common.h',
     '<(libvpx_source)/vp9/common/vp9_onyxc_int.h',
     '<(libvpx_source)/vp9/common/vp9_ppflags.h',
-    '<(libvpx_source)/vp9/common/vp9_pragmas.h',
     '<(libvpx_source)/vp9/common/vp9_pred_common.c',
     '<(libvpx_source)/vp9/common/vp9_pred_common.h',
     '<(libvpx_source)/vp9/common/vp9_prob.c',
@@ -220,7 +216,8 @@
     '<(libvpx_source)/vp9/common/vp9_tile_common.h',
     '<(libvpx_source)/vp9/common/x86/vp9_asm_stubs.c',
     '<(libvpx_source)/vp9/common/x86/vp9_copy_sse2.asm',
-    '<(libvpx_source)/vp9/common/x86/vp9_idct_ssse3.asm',
+    '<(libvpx_source)/vp9/common/x86/vp9_idct_intrin_sse2.h',
+    '<(libvpx_source)/vp9/common/x86/vp9_idct_ssse3_x86_64.asm',
     '<(libvpx_source)/vp9/common/x86/vp9_intrapred_sse2.asm',
     '<(libvpx_source)/vp9/common/x86/vp9_intrapred_ssse3.asm',
     '<(libvpx_source)/vp9/common/x86/vp9_loopfilter_mmx.asm',
@@ -313,16 +310,16 @@
     '<(libvpx_source)/vp9/encoder/vp9_writer.c',
     '<(libvpx_source)/vp9/encoder/vp9_writer.h',
     '<(libvpx_source)/vp9/encoder/x86/vp9_dct_mmx.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_dct_ssse3.asm',
+    '<(libvpx_source)/vp9/encoder/x86/vp9_dct_ssse3_x86_64.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_error_sse2.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_quantize_ssse3.asm',
+    '<(libvpx_source)/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_sad4d_sse2.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_sad_mmx.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_sad_sse2.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_sad_sse3.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_sad_sse4.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_sad_ssse3.asm',
-    '<(libvpx_source)/vp9/encoder/x86/vp9_ssim_opt.asm',
+    '<(libvpx_source)/vp9/encoder/x86/vp9_ssim_opt_x86_64.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_subpel_variance.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_subtract_sse2.asm',
     '<(libvpx_source)/vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm',
@@ -333,13 +330,11 @@
     '<(libvpx_source)/vp9/vp9_iface_common.h',
     '<(libvpx_source)/vpx/internal/vpx_codec_internal.h',
     '<(libvpx_source)/vpx/internal/vpx_psnr.h',
-    '<(libvpx_source)/vpx/src/svc_encodeframe.c',
     '<(libvpx_source)/vpx/src/vpx_codec.c',
     '<(libvpx_source)/vpx/src/vpx_decoder.c',
     '<(libvpx_source)/vpx/src/vpx_encoder.c',
     '<(libvpx_source)/vpx/src/vpx_image.c',
     '<(libvpx_source)/vpx/src/vpx_psnr.c',
-    '<(libvpx_source)/vpx/svc_context.h',
     '<(libvpx_source)/vpx/vp8.h',
     '<(libvpx_source)/vpx/vp8cx.h',
     '<(libvpx_source)/vpx/vp8dx.h',