diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-27 00:05:06 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-27 00:05:06 -0400 |
| commit | 9fbb1d4350781f73d95fefcb3cce32bd04b57793 (patch) | |
| tree | 7a22e9f24d6e792eeb15a11f8cd9cdb916c44fd0 /vp8/encoder/rdopt.c | |
| parent | eccfca5165f24e322135898c079319030a8b7ecc (diff) | |
| parent | db8f0d2ca90929ac3e6fb63ef05651a71dd574ba (diff) | |
| download | libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.tar libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.tar.gz libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.tar.bz2 libvpx-9fbb1d4350781f73d95fefcb3cce32bd04b57793.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I1ae82458536ba2f0969e1bea78f41cd16fe96b79
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 31d765782..c9aafd486 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -732,7 +732,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; @@ -774,11 +774,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; |