[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec vp3.c, 1.48, 1.49 vp3data.h, 1.5, 1.6

Michael Niedermayer CVS michael
Tue May 17 13:36:10 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv25855

Modified Files:
	vp3.c vp3data.h 
Log Message:
remove duplicate zigzag tables


Index: vp3.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- vp3.c	17 May 2005 11:31:57 -0000	1.48
+++ vp3.c	17 May 2005 11:36:07 -0000	1.49
@@ -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));

Index: vp3data.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3data.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vp3data.h	1 Mar 2005 06:14:45 -0000	1.5
+++ vp3data.h	17 May 2005 11:36:07 -0000	1.6
@@ -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 },





More information about the ffmpeg-cvslog mailing list