libvpx: Pull from upstream

source/libvpx/vpx_scale/generic/gen_scalers.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.
  */
 
 
-#include "vpx_scale/vpxscale.h"
+#include "vpx_scale/vpx_scale.h"
 #include "vpx_mem/vpx_mem.h"
 /****************************************************************************
 *  Imports
 ****************************************************************************/
 
 /****************************************************************************
  *
  *
  *  INPUTS        : const unsigned char *source : Pointer to source data.
  *                  unsigned int source_width    : Stride of source.
@@ skipping 208 matching lines @@
 
   for (i = 0; i < width; i++) {
     temp = 8;
     temp += source[i - (int)src_pitch] * 3;
     temp += source[i] * 10;
     temp += source[i + src_pitch] * 3;
     temp >>= 4;
     dest[i] = (unsigned char)(temp);
   }
 }