Commit d30b297c authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review
Browse files

Merge "Don't update encoder skip count for SEG_LVL_SKIP."

parents 60866b03 aaf37656
......@@ -3357,7 +3357,8 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
vp9_tokenize_sb(cpi, t, !output_enabled, MAX(bsize, BLOCK_8X8));
} else {
mbmi->skip = 1;
if (output_enabled)
if (output_enabled &&
!vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP))
reset_skip_context(xd, MAX(bsize, BLOCK_8X8));
Supports Markdown
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