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 292608)
+++ source/libvpx/vp9/encoder/vp9_variance.h	(working copy)
@@ -23,20 +23,20 @@
               unsigned int *sse, int *sum);
 
 #if CONFIG_VP9_HIGHBITDEPTH
-void high_variance(const uint8_t *a8, int a_stride,
-                   const uint8_t *b8, int b_stride,
-                   int w, int h,
-                   unsigned int *sse, int *sum);
+void highbd_variance(const uint8_t *a8, int a_stride,
+                     const uint8_t *b8, int b_stride,
+                     int w, int h,
+                     unsigned int *sse, int *sum);
 
-void high_10_variance(const uint8_t *a8, int a_stride,
-                      const uint8_t *b8, int b_stride,
-                      int w, int h,
-                      unsigned int *sse, int *sum);
+void highbd_10_variance(const uint8_t *a8, int a_stride,
+                        const uint8_t *b8, int b_stride,
+                        int w, int h,
+                        unsigned int *sse, int *sum);
 
-void high_12_variance(const uint8_t *a8, int a_stride,
-                      const uint8_t *b8, int b_stride,
-                      int w, int h,
-                      unsigned int *sse, int *sum);
+void highbd_12_variance(const uint8_t *a8, int a_stride,
+                        const uint8_t *b8, int b_stride,
+                        int w, int h,
+                        unsigned int *sse, int *sum);
 #endif
 
 typedef unsigned int(*vp9_sad_fn_t)(const uint8_t *src_ptr,
@@ -99,8 +99,9 @@
                        int height, const uint8_t *ref, int ref_stride);
 
 #if CONFIG_VP9_HIGHBITDEPTH
-void vp9_high_comp_avg_pred(uint16_t *comp_pred, const uint8_t *pred, int width,
-                            int height, const uint8_t *ref, int ref_stride);
+void vp9_highbd_comp_avg_pred(uint16_t *comp_pred, const uint8_t *pred,
+                              int width, int height,
+                              const uint8_t *ref, int ref_stride);
 #endif
 
 #ifdef __cplusplus