diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-15 08:08:18 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-15 08:08:18 -0500 |
| commit | 4fa8d36f760904c1ad6c8e64597ab2afc8340d11 (patch) | |
| tree | 63898a5882a416eb8dd0f4ffad9da6cc39aca5ad /vp8/common/entropy.c | |
| parent | 6a80032280305c41f20403b07698ca969ec7edb2 (diff) | |
| parent | 3ac73173a4c7e5be0a9846bc323699e7365c60ee (diff) | |
| download | libvpx-4fa8d36f760904c1ad6c8e64597ab2afc8340d11.tar libvpx-4fa8d36f760904c1ad6c8e64597ab2afc8340d11.tar.gz libvpx-4fa8d36f760904c1ad6c8e64597ab2afc8340d11.tar.bz2 libvpx-4fa8d36f760904c1ad6c8e64597ab2afc8340d11.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/common/entropy.c
Change-Id: I35fd49cf92a50d09082fe199d3bf21bfca68a94f
Diffstat (limited to 'vp8/common/entropy.c')
| -rw-r--r-- | vp8/common/entropy.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c index 153dd0020..219483289 100644 --- a/vp8/common/entropy.c +++ b/vp8/common/entropy.c @@ -36,7 +36,7 @@ DECLARE_ALIGNED(16, const int, vp8_default_zig_zag1d[16]) = 7, 11, 14, 15, }; -DECLARE_ALIGNED(16, const short, vp8_default_inv_zig_zag[16]) = +DECLARE_ALIGNED(16, const short, vp8_default_inv_zig_zag[16]) = { 1, 2, 6, 7, 3, 5, 8, 13, @@ -114,23 +114,20 @@ static void init_bit_trees() init_bit_tree(cat6, 13); } - -static vp8bc_index_t bcc1[1], bcc2[2], bcc3[3], bcc4[4], bcc5[5], bcc6[11]; - vp8_extra_bit_struct vp8_extra_bits[12] = { - { 0, 0, 0, 0, 0}, - { 0, 0, 0, 0, 1}, - { 0, 0, 0, 0, 2}, - { 0, 0, 0, 0, 3}, - { 0, 0, 0, 0, 4}, - { cat1, Pcat1, bcc1, 1, 5}, - { cat2, Pcat2, bcc2, 2, 7}, - { cat3, Pcat3, bcc3, 3, 11}, - { cat4, Pcat4, bcc4, 4, 19}, - { cat5, Pcat5, bcc5, 5, 35}, - { cat6, Pcat6, bcc6, 13, 67}, - { 0, 0, 0, 0, 0} + { 0, 0, 0, 0}, + { 0, 0, 0, 1}, + { 0, 0, 0, 2}, + { 0, 0, 0, 3}, + { 0, 0, 0, 4}, + { cat1, Pcat1, 1, 5}, + { cat2, Pcat2, 2, 7}, + { cat3, Pcat3, 3, 11}, + { cat4, Pcat4, 4, 19}, + { cat5, Pcat5, 5, 35}, + { cat6, Pcat6, 13, 67}, + { 0, 0, 0, 0} }; #include "defaultcoefcounts.h" |