Merge "change to avoid IOC"

2014-01-24 16:05:13 -08:00 · 2014-01-24 16:05:13 -08:00 · 7adfa9f4cb
commit 7adfa9f4cb
parent 03eb63c114 8971338c6b
1 changed files with 1 additions and 1 deletions
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@ -428,7 +428,7 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE bsize,
  }

  *out_rate_sum = rate_sum;
-  *out_dist_sum = dist_sum << 4;
+  *out_dist_sum = (int64_t)dist_sum << 4;
 }

 static void model_rd_for_sb_y_tx(VP9_COMP *cpi, BLOCK_SIZE bsize,