ref: 0ca5908ff6a403ab4a792fac4bd165fb642fc90c
parent: 2fe893c94fc5880f799d8749bb99b1aa7db79619
parent: 7e119e29468f5466b2def61dd5281906cb595998
author: Jingning Han <[email protected]>
date: Mon Nov 3 03:46:42 EST 2014
Merge "Fix the THR_MODES array used in vp9_pick_inter_mode"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -453,7 +453,7 @@
}
static const THR_MODES mode_idx[MAX_REF_FRAMES][4] = {- {THR_DC, THR_H_PRED, THR_V_PRED},+ {THR_DC, THR_H_PRED, THR_V_PRED, THR_TM}, {THR_NEARESTMV, THR_NEARMV, THR_ZEROMV, THR_NEWMV}, {THR_NEARESTG, THR_NEARG, THR_ZEROG, THR_NEWG}, {THR_NEARESTA, THR_NEARA, THR_ZEROA, THR_NEWA},