Merge "Fix the THR_MODES array used in vp9_pick_inter_mode"

0ca5908f · Jingning Han · Gerrit Code Review · 2fe893c9 · 7e119e29 · 0ca5908f
Commit 0ca5908f authored Nov 03, 2014 by Jingning Han Committed by Gerrit Code Review Nov 03, 2014
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -453,7 +453,7 @@ static void estimate_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
 }

 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},