libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_rdopt.c

Index: source/libvpx/vp9/encoder/vp9_rdopt.c
===================================================================
--- source/libvpx/vp9/encoder/vp9_rdopt.c	(revision 179051)
+++ source/libvpx/vp9/encoder/vp9_rdopt.c	(working copy)
@@ -847,7 +847,7 @@
     error += this_diff * this_diff;
   }
 
-  return error > INT_MAX ? INT_MAX : error;
+  return error > INT_MAX ? INT_MAX : (int)error;
 }
 
 #define DEBUG_ERROR 0
@@ -3123,9 +3123,9 @@
   ctx->best_ref_mv.as_int = ref_mv->as_int;
   ctx->second_best_ref_mv.as_int = second_ref_mv->as_int;
 
-  ctx->single_pred_diff = comp_pred_diff[SINGLE_PREDICTION_ONLY];
-  ctx->comp_pred_diff   = comp_pred_diff[COMP_PREDICTION_ONLY];
-  ctx->hybrid_pred_diff = comp_pred_diff[HYBRID_PREDICTION];
+  ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_PREDICTION_ONLY];
+  ctx->comp_pred_diff   = (int)comp_pred_diff[COMP_PREDICTION_ONLY];
+  ctx->hybrid_pred_diff = (int)comp_pred_diff[HYBRID_PREDICTION];
 
   memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff));
 }