summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorAlex Converse <aconverse@google.com>2014-11-07 13:44:17 -0800
committerAlex Converse <aconverse@google.com>2014-11-07 13:44:17 -0800
commitce9ba97a9d4f37d2764496006312cd2e60e60d98 (patch)
treec939bf143f56c615958ce88b4b60a2cff9b950db /vp9/encoder
parent08d86bc9043f55d86f20f4bab74bc4ca949b3a4c (diff)
downloadlibvpx-ce9ba97a9d4f37d2764496006312cd2e60e60d98.tar
libvpx-ce9ba97a9d4f37d2764496006312cd2e60e60d98.tar.gz
libvpx-ce9ba97a9d4f37d2764496006312cd2e60e60d98.tar.bz2
libvpx-ce9ba97a9d4f37d2764496006312cd2e60e60d98.zip
Fix LAST SKIP when considering GOLDEN
Change-Id: I39d9f13fa34984ee9dad0c4f303ef672635f420e
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_pickmode.c3
1 files changed, 3 insertions, 0 deletions
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