shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_pickmode: quiet int64->int conversion warning"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1037,7 +1037,7 @@

   // 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 @@

       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;