libvpx: Pull from upstream

source/libvpx/vp8/common/variance.h

Index: source/libvpx/vp8/common/variance.h
diff --git a/source/libvpx/vp8/common/variance.h b/source/libvpx/vp8/common/variance.h
index 552a28025e68289a94f51f720408ba534c9dad76..c6c9f41bf6a449cf40083a5506511b00d34c778a 100644
--- a/source/libvpx/vp8/common/variance.h
+++ b/source/libvpx/vp8/common/variance.h
@@ -29,7 +29,7 @@ typedef unsigned int(*vpx_sad_fn_t)(
 typedef void (*vp8_copy32xn_fn_t)(
     const unsigned char *src_ptr,
     int source_stride,
-    const unsigned char *ref_ptr,
+    unsigned char *ref_ptr,
     int ref_stride,
     int n);
 
@@ -39,6 +39,7 @@ typedef void (*vpx_sad_multi_fn_t)(
     const unsigned char *ref_array,
     int  ref_stride,
     unsigned int *sad_array);
+
 typedef void (*vpx_sad_multi_d_fn_t)
     (
      const unsigned char *src_ptr,
@@ -48,7 +49,7 @@ typedef void (*vpx_sad_multi_d_fn_t)
      unsigned int *sad_array
     );
 
-typedef unsigned int (*vp8_variance_fn_t)
+typedef unsigned int (*vpx_variance_fn_t)
     (
      const unsigned char *src_ptr,
      int source_stride,
@@ -68,37 +69,14 @@ typedef unsigned int (*vp8_subpixvariance_fn_t)
       unsigned int *sse
     );
 
-typedef void (*vp8_ssimpf_fn_t)
-      (
-        unsigned char *s,
-        int sp,
-        unsigned char *r,
-        int rp,
-        unsigned long *sum_s,
-        unsigned long *sum_r,
-        unsigned long *sum_sq_s,
-        unsigned long *sum_sq_r,
-        unsigned long *sum_sxr
-      );
-
-typedef unsigned int (*vp8_getmbss_fn_t)(const short *);
-
-typedef unsigned int (*vp8_get16x16prederror_fn_t)
-    (
-     const unsigned char *src_ptr,
-     int source_stride,
-     const unsigned char *ref_ptr,
-     int  ref_stride
-    );
-
 typedef struct variance_vtable
 {
     vpx_sad_fn_t            sdf;
-    vp8_variance_fn_t       vf;
+    vpx_variance_fn_t       vf;
     vp8_subpixvariance_fn_t svf;
-    vp8_variance_fn_t       svf_halfpix_h;
-    vp8_variance_fn_t       svf_halfpix_v;
-    vp8_variance_fn_t       svf_halfpix_hv;
+    vpx_variance_fn_t       svf_halfpix_h;
+    vpx_variance_fn_t       svf_halfpix_v;
+    vpx_variance_fn_t       svf_halfpix_hv;
     vpx_sad_multi_fn_t      sdx3f;
     vpx_sad_multi_fn_t      sdx8f;
     vpx_sad_multi_d_fn_t    sdx4df;