ref: 889c53a507902008feb3a384fce4ff8514387336
parent: 687c56e8026978f8ccfd5b3fbfee4dbd1de466e1
parent: 9626a0cb624e338aad7dc8e0e67510282bbbc476
author: Paul Wilkins <[email protected]>
date: Tue Oct 21 03:02:13 EDT 2014
Merge "Resolve compiler warning."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2843,7 +2843,7 @@
this_rate += cpi->partition_cost[pl][PARTITION_NONE];
sum_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_dist);
if (sum_rd < best_rd) {- int dist_breakout_thr = sf->partition_search_breakout_dist_thr;
+ int64_t dist_breakout_thr = sf->partition_search_breakout_dist_thr;
int64_t rate_breakout_thr = sf->partition_search_breakout_rate_thr;
dist_breakout_thr >>= 8 - (b_width_log2_lookup[bsize] +