From ce9ba97a9d4f37d2764496006312cd2e60e60d98 Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Fri, 7 Nov 2014 13:44:17 -0800
Subject: Fix LAST SKIP when considering GOLDEN

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

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index f53c07894..8ac3aad25 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -778,6 +778,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
 
     // Check that a prediction mode has been selected.
     assert(best_rdc.rdcost < INT64_MAX);
+
+    if (x->skip)
+      break;
   }
 
   // If best prediction is not in dst buf, then copy the prediction block from
-- 
cgit v1.2.3