[libav-commits] mss3: use standard zigzag table

Kostya Shishkov git at libav.org
Mon Jul 9 18:18:42 CEST 2012


Module: libav
Branch: master
Commit: 5467742232c312b7d61dca7ac57447f728d8d6c9

Author:    Kostya Shishkov <kostya.shishkov at gmail.com>
Committer: Kostya Shishkov <kostya.shishkov at gmail.com>
Date:      Mon Jul  9 18:15:27 2012 +0200

mss3: use standard zigzag table

---

 libavcodec/mss3.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c
index 7ae1b11..e163ec7 100644
--- a/libavcodec/mss3.c
+++ b/libavcodec/mss3.c
@@ -26,6 +26,7 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
+#include "dsputil.h"
 #include "mss34dsp.h"
 
 #define HEADER_SIZE 27
@@ -120,17 +121,6 @@ typedef struct MSS3Context {
     int              hblock[16 * 16];
 } MSS3Context;
 
-static const uint8_t zigzag_scan[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
-};
-
 
 static void model2_reset(Model2 *m)
 {
@@ -557,7 +547,7 @@ static int decode_dct(RangeCoder *c, DCTBlockCoder *bc, int *block,
         if (!sign)
             val = -val;
 
-        zz_pos = zigzag_scan[pos];
+        zz_pos = ff_zigzag_direct[pos];
         block[zz_pos] = val * bc->qmat[zz_pos];
         pos++;
     }



More information about the libav-commits mailing list