summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-05-17 11:36:07 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-05-17 11:36:07 +0000
commit1482fee88d0df2ff1f991725c87221f13b0b1c04 (patch)
treeccd06a7916f9c88f99632d96e0a298dcfedaac40
parent36af0c959e42a9427b2537682746d7f45802f579 (diff)
remove duplicate zigzag tables
Originally committed as revision 4259 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vp3.c5
-rw-r--r--libavcodec/vp3data.h15
2 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 5423da1eed..6bf200b9a1 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -889,7 +889,6 @@ static void init_dequantizer(Vp3DecodeContext *s)
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 @@ static int vp3_decode_init(AVCodecContext *avctx)
&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 --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h
index 85a2337167..df80e39a16 100644
--- a/libavcodec/vp3data.h
+++ b/libavcodec/vp3data.h
@@ -72,21 +72,6 @@ static const uint32_t vp31_filter_limit_values[64] =
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 },