| commit | 0481e8b6e0d387ba12dafed6aaef88cb051f3f7b | [log] [tgz] |
|---|---|---|
| author | Jingning Han <jingning@google.com> | Sat May 27 08:10:17 2017 -0700 |
| committer | Jingning Han <jingning@google.com> | Sun May 28 19:54:08 2017 +0000 |
| tree | d5d7d95953c8acebb639738cc0c1ee6cb76a11dd | |
| parent | e6c1f6be89127b1931ea7dfa3da2973d3a77799c [diff] |
Fix an enc/dec mismatch issue in tokenization Resolve an enc/dec mismatch issue in new-tokenset and var-tx. BUG=aomedia:567 Change-Id: I9bd8ec4c7716bca3a5e551b6e9838fc8ef37f198
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 94b5bed..0a6e83c 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -855,6 +855,9 @@ if (token == BLOCK_Z_TOKEN) { aom_write_symbol(w, 0, *p->head_cdf, HEAD_TOKENS + 1); p++; +#if CONFIG_VAR_TX + break; +#endif continue; }