Merge "Clear implied conversion to int64_t warning."

34ad6d00 · Paul Wilkins · Gerrit Code Review · cf123f40 · 74558bc5 · 34ad6d00
Commit 34ad6d00 authored Mar 03, 2014 by Paul Wilkins Committed by Gerrit Code Review Mar 03, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp9/encoder/vp9_pickmode.c vp9/encoder/vp9_pickmode.c +1 -1

No files found.
--- 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)] =