Merge "Remove ARF mode entries from THR_MODES array in non-RD mode"

This commit is contained in:
Jingning Han 2014-12-19 11:02:51 -08:00 committed by Gerrit Code Review
commit 9c93307c10

View File

@ -447,11 +447,10 @@ static void estimate_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
args->dist += dist;
}
static const THR_MODES mode_idx[MAX_REF_FRAMES][4] = {
static const THR_MODES mode_idx[MAX_REF_FRAMES - 1][4] = {
{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},
};
static const PREDICTION_MODE intra_mode_list[] = {