From: Jingning Han <jingning@google.com>
Date: Wed, 7 Jan 2015 19:57:36 +0000 (-0800)
Subject: Fix best ref frame rd cost update in sub8x8 non-RD mode search
X-Git-Tag: v1.4.0~281^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=802b798f671b0060aa37971723628194abceb551;p=platform%2Fupstream%2Flibvpx.git

Fix best ref frame rd cost update in sub8x8 non-RD mode search

This fixes the issue that sub8x8 inter blocks always end up
with GOLDEN_FRAME.

Change-Id: Id0c25cbb9c2003f43b4dff8fb1572512c246e077
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 926aca2..60c7160 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1165,7 +1165,7 @@ void vp9_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
     }  // loop through sub8x8 blocks
 
     if (this_rd < best_rd) {
-      this_rd = best_rd;
+      best_rd = this_rd;
       best_ref_frame = ref_frame;
     }
   }  // reference frames