libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_sad.c

 /*
  *  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 26 matching lines @@
 unsigned int vp9_sad##m##x##n##_c(const uint8_t *src_ptr, int src_stride, \
                                   const uint8_t *ref_ptr, int ref_stride, \
                                   unsigned int max_sad) { \
   return sad(src_ptr, src_stride, ref_ptr, ref_stride, m, n); \
 } \
 unsigned int vp9_sad##m##x##n##_avg_c(const uint8_t *src_ptr, int src_stride, \
                                       const uint8_t *ref_ptr, int ref_stride, \
                                       const uint8_t *second_pred, \
                                       unsigned int max_sad) { \
   uint8_t comp_pred[m * n]; \
-  comp_avg_pred(comp_pred, second_pred, m, n, ref_ptr, ref_stride); \
+  vp9_comp_avg_pred(comp_pred, second_pred, m, n, ref_ptr, ref_stride); \
   return sad(src_ptr, src_stride, comp_pred, m, m, n); \
 }
 
 sad_mxn_func(64, 64)
 sad_mxn_func(64, 32)
 sad_mxn_func(32, 64)
 sad_mxn_func(32, 32)
 sad_mxn_func(32, 16)
 sad_mxn_func(16, 32)
 sad_mxn_func(16, 16)
@@ skipping 257 matching lines @@
 }
 
 void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride,
                      const uint8_t* const ref_ptr[], int ref_stride,
                      unsigned int *sad_array) {
   int i;
   for (i = 0; i < 4; ++i)
     sad_array[i] = vp9_sad4x4(src_ptr, src_stride, ref_ptr[i], ref_stride,
                               0x7fffffff);
 }