commit 324ebb704a2248ca28eada4eda5f95449143ccea
author Jim Bankoski <jimbankoski@google.com> Thu Sep 12 16:39:05 2013 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Thu Sep 12 16:39:05 2013 -0700
tree 3bec64f8a1b03ee9e6b81ae5e183dc7465f172b8
parent 86fb12b600b9e361fcf9ae4c65eec3aedf211bd5
parent 9ee9918dad0f4bd9d6b7ae1f89f936b2b89a064f

Merge "fix clang warning in rdopt"

vp9/encoder/vp9_rdopt.c

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 00f1b55..cbc8d46 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -59,7 +59,7 @@
 
   {RD_DC_PRED,   INTRA_FRAME,  NONE},
 
-  {NEWMV,     LAST_FRAME,   NONE},
+  {RD_NEWMV,     LAST_FRAME,   NONE},
   {RD_NEWMV,     GOLDEN_FRAME, NONE},
 
   {RD_NEARMV,    LAST_FRAME,   NONE},
@@ -3434,11 +3434,11 @@
         if (vp9_mode_order[best_mode_index].ref_frame > INTRA_FRAME)
           continue;
       }
+      mbmi->mode = rd_mode_to_mode(this_mode);
       if (cpi->sf.mode_search_skip_flags & FLAG_SKIP_INTRA_DIRMISMATCH) {
-        if (conditional_skipintra(this_mode, best_intra_mode))
+        if (conditional_skipintra(mbmi->mode, best_intra_mode))
             continue;
       }
-      mbmi->mode = rd_mode_to_mode(this_mode);
 
       super_block_yrd(cpi, x, &rate_y, &distortion_y, &skippable, NULL,
                       bsize, tx_cache, best_rd);