# HG changeset patch # User michael # Date 1116329767 0 # Node ID 5d4a6edbc99c6e545e0295f4891635923ef33778 # Parent 0d229cf036b9d73fcb20587723f6d644134f48d7 remove duplicate zigzag tables diff -r 0d229cf036b9 -r 5d4a6edbc99c vp3.c --- a/vp3.c Tue May 17 11:31:57 2005 +0000 +++ b/vp3.c Tue May 17 11:36:07 2005 +0000 @@ -889,7 +889,6 @@ for (i = 1; i < 64; i++) { int k= s->scantable.scantable[i]; j = s->scantable.permutated[i]; - s->intra_y_dequant[j] = s->coded_intra_y_dequant[k] * ac_scale_factor / 100; if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL) @@ -2614,10 +2613,6 @@ &ac_bias_3[i][0][0], 4, 2, 0); } - /* build quantization zigzag table */ - for (i = 0; i < 64; i++) - zigzag_index[dezigzag_index[i]] = i; - /* work out the block mapping tables */ s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int)); s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int)); diff -r 0d229cf036b9 -r 5d4a6edbc99c vp3data.h --- a/vp3data.h Tue May 17 11:31:57 2005 +0000 +++ b/vp3data.h Tue May 17 11:36:07 2005 +0000 @@ -72,21 +72,6 @@ 0, 0, 0, 0, 0, 0, 0, 0 }; -/* table used to convert natural order <-> zigzag order */ -static const int dezigzag_index[64] = -{ 0, 1, 8, 16, 9, 2, 3, 10, - 17, 24, 32, 25, 18, 11, 4, 5, - 12, 19, 26, 33, 40, 48, 41, 34, - 27, 20, 13, 6, 7, 14, 21, 28, - 35, 42, 49, 56, 57, 50, 43, 36, - 29, 22, 15, 23, 30, 37, 44, 51, - 58, 59, 52, 45, 38, 31, 39, 46, - 53, 60, 61, 54, 47, 55, 62, 63 -}; - -/* inverse of dezigzag index */ -static __attribute__((unused)) int zigzag_index[64]; - static const uint16_t dc_bias[16][32][2] = { { /* DC bias table 0 */ { 0x2D, 6 },