diff options
| author | James Zern <jzern@google.com> | 2016-06-17 03:58:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-17 03:58:46 +0000 |
| commit | cf2bfcd9d8c5c18a4151593c5ea09d0163d2b55c (patch) | |
| tree | 14e3f48cfe06f619cb7ecbb28c9887878ff6a603 | |
| parent | ee30cf14089c36d403572f7e7e4a9eb5db69a4ef (diff) | |
| parent | ff8edd3509773397b699d70b8701dba9fced3bf0 (diff) | |
| download | libvpx-cf2bfcd9d8c5c18a4151593c5ea09d0163d2b55c.tar libvpx-cf2bfcd9d8c5c18a4151593c5ea09d0163d2b55c.tar.gz libvpx-cf2bfcd9d8c5c18a4151593c5ea09d0163d2b55c.tar.bz2 libvpx-cf2bfcd9d8c5c18a4151593c5ea09d0163d2b55c.zip | |
Merge "vp9_pickmode: quiet int64->int conversion warning"
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 130fc2b03..f027f9f31 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1037,7 +1037,7 @@ void vp9_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *rd_cost, // Change the limit of this loop to add other intra prediction // mode tests. for (this_mode = DC_PRED; this_mode <= H_PRED; ++this_mode) { - this_rdc.rate = this_rdc.dist = 0; + this_rdc.dist = this_rdc.rate = 0; args.mode = this_mode; args.skippable = 1; args.rdc = &this_rdc; @@ -1921,7 +1921,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, mi->mode = this_mode; mi->ref_frame[0] = INTRA_FRAME; - this_rdc.rate = this_rdc.dist = 0; + this_rdc.dist = this_rdc.rate = 0; args.mode = this_mode; args.skippable = 1; args.rdc = &this_rdc; |