diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-26 12:57:43 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-07-26 12:57:43 -0700 |
| commit | db8f0d2ca90929ac3e6fb63ef05651a71dd574ba (patch) | |
| tree | 4a7abc35836c441d9ed697ce860af69a42edd99c /vp8/encoder/rdopt.c | |
| parent | ca7e346669ce7d9a410edc19a828f9ca9637626d (diff) | |
| parent | b45065d38b5ccbf6a34b697edf5021fe00171f24 (diff) | |
| download | libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.tar libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.tar.gz libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.tar.bz2 libvpx-db8f0d2ca90929ac3e6fb63ef05651a71dd574ba.zip | |
Merge "cosmetics: consistently use [u]int64_t"
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 8b1854161..caf1189c3 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -665,7 +665,7 @@ static int rd_pick_intra4x4mby_modes(VP8_COMP *cpi, MACROBLOCK *mb, int *Rate, int cost = mb->mbmode_cost [xd->frame_type] [B_PRED]; int distortion = 0; int tot_rate_y = 0; - long long total_rd = 0; + int64_t total_rd = 0; ENTROPY_CONTEXT_PLANES t_above, t_left; ENTROPY_CONTEXT *ta; ENTROPY_CONTEXT *tl; @@ -707,11 +707,11 @@ static int rd_pick_intra4x4mby_modes(VP8_COMP *cpi, MACROBLOCK *mb, int *Rate, mic->bmi[i].as_mode = best_mode; - if(total_rd >= (long long)best_rd) + if(total_rd >= (int64_t)best_rd) break; } - if(total_rd >= (long long)best_rd) + if(total_rd >= (int64_t)best_rd) return INT_MAX; *Rate = cost; |