From: Jingning Han <jingning@google.com>
Date: Tue, 16 Dec 2014 23:46:59 +0000 (-0800)
Subject: Set second ref frame to be NONE in key frame coding
X-Git-Tag: v1.4.0~338^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01613aa753b6ce906a84d0628f210c0848362e25;p=libvpx

Set second ref frame to be NONE in key frame coding

This commit explicitly set the second reference frame type to be
NONE in key frame coding mode. This fixes a subtle dependency of
reference motion vector used by next inter frame on mode_info
reset before key frame coding.

Change-Id: I5ff0359753fdc9992b0bfe889490f7a32d7d5f6a
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index bc5edc815..e5a98d1bd 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2726,6 +2726,7 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
   x->skip_encode = 0;
   ctx->skip = 0;
   xd->mi[0].src_mi->mbmi.ref_frame[0] = INTRA_FRAME;
+  xd->mi[0].src_mi->mbmi.ref_frame[1] = NONE;
 
   if (bsize >= BLOCK_8X8) {
     if (rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly,