From ee41141466c0261678b6e92dc361534d1c5a209b Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Tue, 17 Mar 2015 10:12:00 -0700
Subject: [PATCH] Fix an ioc warning in vp9_pick_inter_mode

Shut off all the metric checks for golden reference frame, if we
decide that it is unlikely to be selected for reference.

Change-Id: Ie457cc1fd43935584403b4982659aed80fb9909c
---
 vp9/encoder/vp9_pickmode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 7c1a93062..a96a97453 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -723,12 +723,14 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
 #if CONFIG_VP9_TEMPORAL_DENOISING
   vp9_denoiser_reset_frame_stats(ctx);
 #endif
+
   if (cpi->rc.frames_since_golden == 0) {
-    ref_frame_skip_mask |= (1 << GOLDEN_FRAME);
+    cpi->ref_frame_flags &= (~VP9_GOLD_FLAG);
     usable_ref_frame = LAST_FRAME;
   } else {
     usable_ref_frame = GOLDEN_FRAME;
   }
+
   for (ref_frame = LAST_FRAME; ref_frame <= usable_ref_frame; ++ref_frame) {
     const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_buffer(cpi, ref_frame);