Merge "Fix the THR_MODES array used in vp9_pick_inter_mode"

This commit is contained in:
Jingning Han 2014-11-03 08:46:42 -08:00 committed by Gerrit Code Review
commit 0ca5908ff6

View File

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