diff options
author | Jim Bankoski <jimbankoski@google.com> | 2014-01-31 20:16:37 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-31 20:16:37 -0800 |
commit | 37e5325b9f985e7ce1cd8a128b9bebafded60f40 (patch) | |
tree | 52275a5e3bc136b053935bb20f581b16d85f3b00 /vp9/decoder/vp9_detokenize.c | |
parent | 1c3fc437717a790e2f97be5b5484b8914336af6e (diff) | |
parent | 9dec7712abd23f8523f1f9c6e1d5c5c8b0844126 (diff) | |
download | libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.tar libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.tar.gz libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.tar.bz2 libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.zip |
Merge "static function convert to inline or global vp9_blockd.h"
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
-rw-r--r-- | vp9/decoder/vp9_detokenize.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 18cafbaef..52e78cd90 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -204,7 +204,7 @@ int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd, const int eob = decode_coefs(cm, xd, pd->plane_type, BLOCK_OFFSET(pd->dqcoeff, block), tx_size, pd->dequant, ctx, so->scan, so->neighbors, r); - set_contexts(xd, pd, plane_bsize, tx_size, eob > 0, x, y); + vp9_set_contexts(xd, pd, plane_bsize, tx_size, eob > 0, x, y); return eob; } |