diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-03-03 09:28:12 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-03 09:28:12 -0800 |
| commit | 34ad6d00d22cb4869b3edb5f5d486d9d7ad80835 (patch) | |
| tree | f81b15c0da20e3bc70ecd9c2ffd1fa663449220e /vp9 | |
| parent | cf123f40ee859723c34346bb68e94708206ea594 (diff) | |
| parent | 74558bc582e46cc76ab1a5b0515d1131e6df4df8 (diff) | |
| download | libvpx-34ad6d00d22cb4869b3edb5f5d486d9d7ad80835.tar libvpx-34ad6d00d22cb4869b3edb5f5d486d9d7ad80835.tar.gz libvpx-34ad6d00d22cb4869b3edb5f5d486d9d7ad80835.tar.bz2 libvpx-34ad6d00d22cb4869b3edb5f5d486d9d7ad80835.zip | |
Merge "Clear implied conversion to int64_t warning."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index edb14ea42..9ba48a1b5 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -261,7 +261,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, continue; if (this_mode == NEWMV) { - if (this_rd < (1 << num_pels_log2_lookup[bsize])) + if (this_rd < (int64_t)(1 << num_pels_log2_lookup[bsize])) continue; x->mode_sad[ref_frame][INTER_OFFSET(NEWMV)] = |