libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_variance.h

Index: source/libvpx/vp9/encoder/vp9_variance.h
===================================================================
--- source/libvpx/vp9/encoder/vp9_variance.h	(revision 232232)
+++ source/libvpx/vp9/encoder/vp9_variance.h	(working copy)
@@ -14,6 +14,15 @@
 #include "vpx/vpx_integer.h"
 // #include "./vpx_config.h"
 
+void variance(const uint8_t *src_ptr,
+              int  source_stride,
+              const uint8_t *ref_ptr,
+              int  recon_stride,
+              int  w,
+              int  h,
+              unsigned int *sse,
+              int *sum);
+
 typedef unsigned int(*vp9_sad_fn_t)(const uint8_t *src_ptr,
                                     int source_stride,
                                     const uint8_t *ref_ptr,
@@ -67,12 +76,6 @@
                                                    unsigned int *sse,
                                                    const uint8_t *second_pred);
 
-typedef void (*vp9_ssimpf_fn_t)(uint8_t *s, int sp, uint8_t *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 (*vp9_getmbss_fn_t)(const short *);
 
 typedef unsigned int (*vp9_get16x16prederror_fn_t)(const uint8_t *src_ptr,