libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_pickmode.h

Index: source/libvpx/vp9/encoder/vp9_pickmode.h
===================================================================
--- source/libvpx/vp9/encoder/vp9_pickmode.h	(revision 292072)
+++ source/libvpx/vp9/encoder/vp9_pickmode.h	(working copy)
@@ -17,20 +17,14 @@
 extern "C" {
 #endif
 
-typedef struct {
-  uint8_t *data;
-  int stride;
-  int in_use;
-} PRED_BUFFER;
+void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
+                         const struct TileInfo *const tile,
+                         int mi_row, int mi_col,
+                         int *returnrate,
+                         int64_t *returndistortion,
+                         BLOCK_SIZE bsize,
+                         PICK_MODE_CONTEXT *ctx);
 
-int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
-                            const struct TileInfo *const tile,
-                            int mi_row, int mi_col,
-                            int *returnrate,
-                            int64_t *returndistortion,
-                            BLOCK_SIZE bsize,
-                            PICK_MODE_CONTEXT *ctx);
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif