Merge "Spatial SVC crash fix"

This commit is contained in:
Debargha Mukherjee 2015-12-01 21:24:46 +00:00 committed by Gerrit Code Review
commit 01a2b40e95

View File

@ -2423,8 +2423,15 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td,
if (cpi->sf.use_square_partition_only &&
bsize > cpi->sf.use_square_only_threshold) {
if (cpi->use_svc) {
if (!vp9_active_h_edge(cpi, mi_row, mi_step) || x->e_mbd.lossless)
partition_horz_allowed &= force_horz_split;
if (!vp9_active_v_edge(cpi, mi_row, mi_step) || x->e_mbd.lossless)
partition_vert_allowed &= force_vert_split;
} else {
partition_horz_allowed &= force_horz_split;
partition_vert_allowed &= force_vert_split;
}
}
save_context(x, mi_row, mi_col, a, l, sa, sl, bsize);