libvpx: Pull from upstream

source/libvpx/vp9/common/x86/vp9_asm_stubs.c

Index: source/libvpx/vp9/common/x86/vp9_asm_stubs.c
===================================================================
--- source/libvpx/vp9/common/x86/vp9_asm_stubs.c	(revision 177019)
+++ source/libvpx/vp9/common/x86/vp9_asm_stubs.c	(working copy)
@@ -9,14 +9,12 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "./vpx_config.h"
 #include "vpx_ports/mem.h"
 #include "vp9/common/vp9_subpixel.h"
 
 extern const short vp9_six_tap_mmx[8][6 * 8];
 
-extern const short vp9_bilinear_filters_8x_mmx[8][2 * 8];
-
 extern void vp9_filter_block1d_h6_mmx(unsigned char   *src_ptr,
                                       unsigned short  *output_ptr,
                                       unsigned int     src_pixels_per_line,
@@ -95,8 +93,6 @@
                                              unsigned int   output_height,
                                              const short   *vp9_filter);
 
-extern prototype_subpixel_predict(vp9_bilinear_predict8x8_mmx);
-
 ///////////////////////////////////////////////////////////////////////////
 // the mmx function that does the bilinear filtering and var calculation //
 // int one pass                                                          //
@@ -232,26 +228,6 @@
   vp9_filter_block1dc_v6_mmx(fdata2 + 20, dst_ptr + 4, dst_pitch,
                              16, 8, 4, 8, vfilter);
 }
-
-void vp9_bilinear_predict16x16_mmx(unsigned char  *src_ptr,
-                                   int  src_pixels_per_line,
-                                   int  xoffset,
-                                   int  yoffset,
-                                   unsigned char *dst_ptr,
-                                   int  dst_pitch) {
-  vp9_bilinear_predict8x8_mmx(src_ptr,
-                              src_pixels_per_line, xoffset, yoffset,
-                              dst_ptr, dst_pitch);
-  vp9_bilinear_predict8x8_mmx(src_ptr + 8,
-                              src_pixels_per_line, xoffset, yoffset,
-                              dst_ptr + 8, dst_pitch);
-  vp9_bilinear_predict8x8_mmx(src_ptr + 8 * src_pixels_per_line,
-                              src_pixels_per_line, xoffset, yoffset,
-                              dst_ptr + dst_pitch * 8, dst_pitch);
-  vp9_bilinear_predict8x8_mmx(src_ptr + 8 * src_pixels_per_line + 8,
-                              src_pixels_per_line, xoffset, yoffset,
-                              dst_ptr + dst_pitch * 8 + 8, dst_pitch);
-}
 #endif
 
 #if HAVE_SSE2