Commit 42e5c2ad authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Two minor logic fixes

Change-Id: I1d5624fb2f34f87a55613036851034ec7c2d0b76
parent cb61bfa6
......@@ -1457,7 +1457,7 @@ static void write_modes_b(VP10_COMP *cpi, const TileInfo *const tile,
assert(*tok < tok_end);
pack_palette_tokens(w, tok, m->mbmi.palette_mode_info.palette_size[plane],
rows * cols - 1);
assert(*tok < tok_end);
assert(*tok < tok_end + m->mbmi.skip);
}
}
......
......@@ -8286,7 +8286,7 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
rd_cost->rate = rate2;
#if CONFIG_SUPERTX
if (x->skip && rate_y == INT_MAX)
if (x->skip)
*returnrate_nocoef = rate2;
else
*returnrate_nocoef = rate2 - rate_y - rate_uv;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment