diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-31 15:52:35 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-31 15:52:35 -0800 |
| commit | a8a2f22958a303e0876cffd2abe1527de41633c0 (patch) | |
| tree | 853e119a4171625071d8e96e542806c50d7f73f3 /vp9/encoder/vp9_tokenize.c | |
| parent | d009b06ebf748eb7a603e808994d619cbf9f1163 (diff) | |
| parent | b107f2c4708c05f40c3a2709ad83984ede48e1db (diff) | |
| download | libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.tar libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.tar.gz libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.tar.bz2 libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.zip | |
Merge "Renaming "mbskip" to "skip"."
Diffstat (limited to 'vp9/encoder/vp9_tokenize.c')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index b04e3fe30..8e646f669 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -301,7 +301,7 @@ void vp9_tokenize_sb(VP9_COMP *cpi, TOKENEXTRA **t, int dry_run, struct tokenize_b_args arg = {cpi, xd, t, mbmi->tx_size, cpi->mb.token_cache}; if (mbmi->skip_coeff) { if (!dry_run) - cm->counts.mbskip[ctx][1] += skip_inc; + cm->counts.skip[ctx][1] += skip_inc; reset_skip_context(xd, bsize); if (dry_run) *t = t_backup; @@ -309,7 +309,7 @@ void vp9_tokenize_sb(VP9_COMP *cpi, TOKENEXTRA **t, int dry_run, } if (!dry_run) { - cm->counts.mbskip[ctx][0] += skip_inc; + cm->counts.skip[ctx][0] += skip_inc; foreach_transformed_block(xd, bsize, tokenize_b, &arg); } else { foreach_transformed_block(xd, bsize, set_entropy_context_b, &arg); |