libvpx: Pull from upstream

source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm

Index: source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
diff --git a/source/libvpx/vp8/common/x86/mfqe_sse2.asm b/source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
similarity index 92%
copy from source/libvpx/vp8/common/x86/mfqe_sse2.asm
copy to source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
index a8a7f568dcdfb09365114b7c02a1e24e37f23588..6029420d11424f0913ee56428704e90fdc8b2934 100644
--- a/source/libvpx/vp8/common/x86/mfqe_sse2.asm
+++ b/source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
@@ -1,5 +1,5 @@
 ;
-;  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
+;  Copyright (c) 2015 The WebM project authors. All Rights Reserved.
 ;
 ;  Use of this source code is governed by a BSD-style license
 ;  that can be found in the LICENSE file in the root of the source
@@ -8,10 +8,11 @@
 ;  be found in the AUTHORS file in the root of the source tree.
 ;
 
-
+;  This file is a duplicate of mfqe_sse2.asm in VP8.
+;  TODO(jackychen): Find a way to fix the duplicate.
 %include "vpx_ports/x86_abi_support.asm"
 
-;void vp8_filter_by_weight16x16_sse2
+;void vp9_filter_by_weight16x16_sse2
 ;(
 ;    unsigned char *src,
 ;    int            src_stride,
@@ -19,8 +20,8 @@
 ;    int            dst_stride,
 ;    int            src_weight
 ;)
-global sym(vp8_filter_by_weight16x16_sse2) PRIVATE
-sym(vp8_filter_by_weight16x16_sse2):
+global sym(vp9_filter_by_weight16x16_sse2) PRIVATE
+sym(vp9_filter_by_weight16x16_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 5
@@ -89,7 +90,7 @@ sym(vp8_filter_by_weight16x16_sse2):
 
     ret
 
-;void vp8_filter_by_weight8x8_sse2
+;void vp9_filter_by_weight8x8_sse2
 ;(
 ;    unsigned char *src,
 ;    int            src_stride,
@@ -97,8 +98,8 @@ sym(vp8_filter_by_weight16x16_sse2):
 ;    int            dst_stride,
 ;    int            src_weight
 ;)
-global sym(vp8_filter_by_weight8x8_sse2) PRIVATE
-sym(vp8_filter_by_weight8x8_sse2):
+global sym(vp9_filter_by_weight8x8_sse2) PRIVATE
+sym(vp9_filter_by_weight8x8_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 5
@@ -156,7 +157,7 @@ sym(vp8_filter_by_weight8x8_sse2):
 
     ret
 
-;void vp8_variance_and_sad_16x16_sse2 | arg
+;void vp9_variance_and_sad_16x16_sse2 | arg
 ;(
 ;    unsigned char *src1,          0
 ;    int            stride1,       1
@@ -165,8 +166,8 @@ sym(vp8_filter_by_weight8x8_sse2):
 ;    unsigned int  *variance,      4
 ;    unsigned int  *sad,           5
 ;)
-global sym(vp8_variance_and_sad_16x16_sse2) PRIVATE
-sym(vp8_variance_and_sad_16x16_sse2):
+global sym(vp9_variance_and_sad_16x16_sse2) PRIVATE
+sym(vp9_variance_and_sad_16x16_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 6
@@ -284,4 +285,3 @@ tMFQE: ; 1 << MFQE_PRECISION
 align 16
 tMFQE_round: ; 1 << (MFQE_PRECISION - 1)
     times 8 dw 0x08
-