Merge "Fix rectangular partition check flag"

This commit is contained in:
Jingning Han 2013-08-22 18:59:18 -07:00 committed by Gerrit Code Review
commit 9655c2c7a6

View File

@ -1776,8 +1776,8 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row,
} else {
// skip rectangular partition test when larger block size
// gives better rd cost
do_rect &= !partition_none_allowed &&
cpi->sf.less_rectangular_check;
if (cpi->sf.less_rectangular_check)
do_rect &= !partition_none_allowed;
}
}
partition_split_done = 1;