Roll src/third_party/libvpx/source/libvpx/ 4f774ac50..f80d8011a (12 commits).

third_party/libvpx/libvpx_srcs_x86_intrinsics.gypi

 # This file is generated. Do not edit.
 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'libvpx_intrinsics_mmx',
       'type': 'static_library',
@@ skipping 15 matching lines @@
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
         '<(libvpx_source)',
       ],
       'sources': [
         '<(libvpx_source)/vp8/common/x86/idct_blk_sse2.c',
         '<(libvpx_source)/vp8/encoder/x86/denoising_sse2.c',
         '<(libvpx_source)/vp8/encoder/x86/vp8_enc_stubs_sse2.c',
         '<(libvpx_source)/vp8/encoder/x86/vp8_quantize_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_idct_intrin_sse2.c',
-        '<(libvpx_source)/vp9/encoder/x86/vp9_dct_sse2.c',
+        '<(libvpx_source)/vp9/encoder/x86/vp9_dct_intrin_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_denoiser_sse2.c',
         '<(libvpx_source)/vp9/encoder/x86/vp9_quantize_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/avg_intrin_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/fwd_txfm_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/halfpix_variance_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/inv_txfm_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/loopfilter_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/quantize_sse2.c',
         '<(libvpx_source)/vpx_dsp/x86/variance_sse2.c',
       ],
@@ skipping 41 matching lines @@
         ['OS=="win" and clang==1', {
           # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe
           # doesn't need it for intrinsics. clang-cl does need it, though.
           'msvs_settings': {
             'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] },
           },
         }],
       ],
     },
     {
-      'target_name': 'libvpx_intrinsics_avx',
-      'type': 'static_library',
-      'include_dirs': [
-        'source/config/<(OS_CATEGORY)/<(target_arch_full)',
-        '<(libvpx_source)',
-      ],
-      'sources': [
-        '<(libvpx_source)/vp9/encoder/x86/vp9_diamond_search_sad_avx.c',
-      ],
-      'cflags': [ '-mavx', ],
-      'xcode_settings': { 'OTHER_CFLAGS': [ '-mavx' ] },
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          'EnableEnhancedInstructionSet': '3', # /arch:AVX
-        },
-      },
-    },
-    {
       'target_name': 'libvpx_intrinsics_avx2',
       'type': 'static_library',
       'include_dirs': [
         'source/config/<(OS_CATEGORY)/<(target_arch_full)',
         '<(libvpx_source)',
       ],
       'sources': [
         '<(libvpx_source)/vp9/encoder/x86/vp9_error_intrin_avx2.c',
         '<(libvpx_source)/vpx_dsp/x86/fwd_txfm_avx2.c',
         '<(libvpx_source)/vpx_dsp/x86/loopfilter_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',
         '<(libvpx_source)/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c',
       ],
       'cflags': [ '-mavx2', ],
       'xcode_settings': { 'OTHER_CFLAGS': [ '-mavx2' ] },
       'msvs_settings': {
         'VCCLCompilerTool': {
           'EnableEnhancedInstructionSet': '5', # /arch:AVX2
         },
       },
     },
   ],
 }