ref: 2dc92482d060ba57926301d9e74dff962e412d7e
parent: 4fffefe189a9123d4b04482c26a1be5eb632b397
parent: 4f95a7fe3ef8e786dbb6c9c1dc3240da24538f92
author: Yaowu Xu <[email protected]>
date: Wed Apr 9 10:29:23 EDT 2014
Merge "Fix the setting of mode_skip_mask"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3304,7 +3304,7 @@
// Look at the reference frame of the best mode so far and set the
// skip mask to look at a subset of the remaining modes.
- if (mode_index == mode_skip_start) {
+ if (mode_index == mode_skip_start && best_rd < INT64_MAX) {
switch (vp9_mode_order[best_mode_index].ref_frame[0]) {
case INTRA_FRAME:
break;