libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_variance.h

 /*
  *  Copyright (c) 2010 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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 68 matching lines @@
     vp9_subpixvariance_fn_t    svf;
     vp9_subp_avg_variance_fn_t svaf;
     vp9_variance_fn_t          svf_halfpix_h;
     vp9_variance_fn_t          svf_halfpix_v;
     vp9_variance_fn_t          svf_halfpix_hv;
     vp9_sad_multi_fn_t         sdx3f;
     vp9_sad_multi1_fn_t        sdx8f;
     vp9_sad_multi_d_fn_t       sdx4df;
 } vp9_variance_fn_ptr_t;
 
-static void comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int weight,
+static void comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int width,
                           int height, uint8_t *ref, int ref_stride) {
   int i, j;
 
   for (i = 0; i < height; i++) {
-    for (j = 0; j < weight; j++) {
+    for (j = 0; j < width; j++) {
       int tmp;
       tmp = pred[j] + ref[j];
       comp_pred[j] = (tmp + 1) >> 1;
     }
-    comp_pred += weight;
-    pred += weight;
+    comp_pred += width;
+    pred += width;
     ref += ref_stride;
   }
 }
 #endif  // VP9_ENCODER_VP9_VARIANCE_H_