libvpx: Pull from upstream

source/libvpx/vpx_scale/win32/scaleopt.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.
  */
 
 
 /****************************************************************************
 *
 *   Module Title :     scaleopt.cpp
 *
 *   Description  :     Optimized scaling functions
 *
 ****************************************************************************/
 #include "pragmas.h"
 
 /****************************************************************************
 *  Module Statics
 ****************************************************************************/
 __declspec(align(16)) const static unsigned short round_values[] = { 128, 128, 128, 128 };
 
-#include "vpx_scale/vpxscale.h"
+#include "vpx_scale/vpx_scale.h"
 #include "vpx_mem/vpx_mem.h"
 
 __declspec(align(16)) const static unsigned short const54_2[] = {  0,  64, 128, 192 };
 __declspec(align(16)) const static unsigned short const54_1[] = {256, 192, 128,  64 };
 
 
 /****************************************************************************
  *
  *  ROUTINE       : horizontal_line_5_4_scale_mmx
  *
@@ skipping 479 matching lines @@
 void
 register_mmxscalers(void) {
   vp8_vertical_band_5_4_scale           = vertical_band_5_4_scale_mmx;
   vp8_vertical_band_5_3_scale           = vertical_band_5_3_scale_mmx;
   vp8_vertical_band_2_1_scale           = vertical_band_2_1_scale_mmx;
   vp8_vertical_band_2_1_scale_i         = vertical_band_2_1_scale_i_mmx;
   vp8_horizontal_line_2_1_scale         = horizontal_line_2_1_scale_mmx;
   vp8_horizontal_line_5_3_scale         = horizontal_line_5_3_scale_mmx;
   vp8_horizontal_line_5_4_scale         = horizontal_line_5_4_scale_mmx;
 }