libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_reconintra.h

Index: source/libvpx/vp9/common/vp9_reconintra.h
===================================================================
--- source/libvpx/vp9/common/vp9_reconintra.h	(revision 177019)
+++ source/libvpx/vp9/common/vp9_reconintra.h	(working copy)
@@ -11,34 +11,40 @@
 #ifndef VP9_COMMON_VP9_RECONINTRA_H_
 #define VP9_COMMON_VP9_RECONINTRA_H_
 
+#include "vpx/vpx_integer.h"
 #include "vp9/common/vp9_blockd.h"
 
 extern void vp9_recon_intra_mbuv(MACROBLOCKD *xd);
-extern B_PREDICTION_MODE vp9_find_dominant_direction(unsigned char *ptr,
+extern B_PREDICTION_MODE vp9_find_dominant_direction(uint8_t *ptr,
                                                      int stride, int n);
 extern B_PREDICTION_MODE vp9_find_bpred_context(BLOCKD *x);
 #if CONFIG_COMP_INTERINTRA_PRED
 extern void vp9_build_interintra_16x16_predictors_mb(MACROBLOCKD *xd,
-                                                     unsigned char *ypred,
-                                                     unsigned char *upred,
-                                                     unsigned char *vpred,
+                                                     uint8_t *ypred,
+                                                     uint8_t *upred,
+                                                     uint8_t *vpred,
                                                      int ystride,
                                                      int uvstride);
 extern void vp9_build_interintra_16x16_predictors_mby(MACROBLOCKD *xd,
-                                                      unsigned char *ypred,
+                                                      uint8_t *ypred,
                                                       int ystride);
 extern void vp9_build_interintra_16x16_predictors_mbuv(MACROBLOCKD *xd,
-                                                       unsigned char *upred,
-                                                       unsigned char *vpred,
+                                                       uint8_t *upred,
+                                                       uint8_t *vpred,
                                                        int uvstride);
-#if CONFIG_SUPERBLOCKS
+#endif  // CONFIG_COMP_INTERINTRA_PRED
+
 extern void vp9_build_interintra_32x32_predictors_sb(MACROBLOCKD *xd,
-                                                     unsigned char *ypred,
-                                                     unsigned char *upred,
-                                                     unsigned char *vpred,
+                                                     uint8_t *ypred,
+                                                     uint8_t *upred,
+                                                     uint8_t *vpred,
                                                      int ystride,
                                                      int uvstride);
-#endif
-#endif
+extern void vp9_build_interintra_64x64_predictors_sb(MACROBLOCKD *xd,
+                                                     uint8_t *ypred,
+                                                     uint8_t *upred,
+                                                     uint8_t *vpred,
+                                                     int ystride,
+                                                     int uvstride);
 
-#endif  // __INC_RECONINTRA_H
+#endif  // VP9_COMMON_VP9_RECONINTRA_H_