Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vp8/encoder/x86/variance_sse2.c

Index: libvpx/source/libvpx/vp8/encoder/x86/variance_sse2.c
diff --git a/libvpx/source/libvpx/vp8/encoder/x86/variance_sse2.c b/libvpx/source/libvpx/vp8/encoder/x86/variance_sse2.c
index 24062eb9be0f52e7e7376b913e4b02fe010f6bcd..0edda30623b88bbeb44fc29ef0224f016c028887 100644
--- a/libvpx/source/libvpx/vp8/encoder/x86/variance_sse2.c
+++ b/libvpx/source/libvpx/vp8/encoder/x86/variance_sse2.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_config.h"
+
 #include "vp8/encoder/variance.h"
 #include "vp8/common/pragmas.h"
 #include "vpx_ports/mem.h"
@@ -53,6 +53,13 @@ unsigned int vp8_get16x16var_sse2
     unsigned int *SSE,
     int *Sum
 );
+unsigned int vp8_get16x16pred_error_sse2
+(
+    const unsigned char *src_ptr,
+    int src_stride,
+    const unsigned char *ref_ptr,
+    int ref_stride
+);
 unsigned int vp8_get8x8var_sse2
 (
     const unsigned char *src_ptr,
@@ -141,31 +148,30 @@ unsigned int vp8_variance4x4_wmt(
     const unsigned char *src_ptr,
     int  source_stride,
     const unsigned char *ref_ptr,
-    int  recon_stride,
-    unsigned int *sse)
+    int  recon_stride)
 {
     unsigned int var;
     int avg;
 
     vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
-    *sse = var;
     return (var - ((avg * avg) >> 4));
 
 }
 
+
+
 unsigned int vp8_variance8x8_wmt
 (
     const unsigned char *src_ptr,
     int  source_stride,
     const unsigned char *ref_ptr,
-    int  recon_stride,
-    unsigned int *sse)
+    int  recon_stride)
 {
     unsigned int var;
     int avg;
 
     vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ;
-    *sse = var;
+
     return (var - ((avg * avg) >> 6));
 
 }