diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-10-21 07:02:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-21 07:02:13 -0700 |
| commit | 889c53a507902008feb3a384fce4ff8514387336 (patch) | |
| tree | a06dc6335c1d160cbcf7b2cdfd0d1b0b63034967 /vp9 | |
| parent | 687c56e8026978f8ccfd5b3fbfee4dbd1de466e1 (diff) | |
| parent | 9626a0cb624e338aad7dc8e0e67510282bbbc476 (diff) | |
| download | libvpx-889c53a507902008feb3a384fce4ff8514387336.tar libvpx-889c53a507902008feb3a384fce4ff8514387336.tar.gz libvpx-889c53a507902008feb3a384fce4ff8514387336.tar.bz2 libvpx-889c53a507902008feb3a384fce4ff8514387336.zip | |
Merge "Resolve compiler warning."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 6eff8c501..f4e71aeb3 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2843,7 +2843,7 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, 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] + |