Merge "Fix an ioc issue in super_block_uvrd"

This commit is contained in:
Jingning Han 2014-10-16 12:35:11 -07:00 коммит произвёл Gerrit Code Review
Родитель d86d834fcb ed100c0b00
Коммит 4b5f01e12e
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -1140,12 +1140,14 @@ static int super_block_uvrd(const VP9_COMP *cpi, MACROBLOCK *x,
*sse = 0; *sse = 0;
*skippable = 1; *skippable = 1;
for (plane = 1; plane < MAX_MB_PLANE && is_cost_valid; ++plane) { for (plane = 1; plane < MAX_MB_PLANE; ++plane) {
txfm_rd_in_plane(x, &pnrate, &pndist, &pnskip, &pnsse, txfm_rd_in_plane(x, &pnrate, &pndist, &pnskip, &pnsse,
ref_best_rd, plane, bsize, uv_tx_size, ref_best_rd, plane, bsize, uv_tx_size,
cpi->sf.use_fast_coef_costing); cpi->sf.use_fast_coef_costing);
if (pnrate == INT_MAX) if (pnrate == INT_MAX) {
is_cost_valid = 0; is_cost_valid = 0;
break;
}
*rate += pnrate; *rate += pnrate;
*distortion += pndist; *distortion += pndist;
*sse += pnsse; *sse += pnsse;