[FFmpeg-cvslog] r21897 - in trunk/libavcodec: indeo5.c indeo5data.h

[stefang]

Author: stefang
Date: Fri Feb 19 18:17:20 2010
New Revision: 21897

Log:
remove ivi5_scans8x8[0], it duplicates ff_zigzag_direct

Modified:
   trunk/libavcodec/indeo5.c
   trunk/libavcodec/indeo5data.h

Modified: trunk/libavcodec/indeo5.c
==============================================================================
--- trunk/libavcodec/indeo5.c	Fri Feb 19 17:26:21 2010	(r21896)
+++ trunk/libavcodec/indeo5.c	Fri Feb 19 18:17:20 2010	(r21897)
@@ -30,6 +30,7 @@
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
+#include "dsputil.h"
 #include "ivi_dsp.h"
 #include "ivi_common.h"
 #include "indeo5data.h"
@@ -183,25 +184,25 @@ static int decode_gop_header(IVI5DecCont
             case 0:
                 band->inv_transform = ff_ivi_inverse_slant_8x8;
                 band->dc_transform  = ff_ivi_dc_slant_2d;
-                band->scan          = ivi5_scans8x8[0];
+                band->scan          = ff_zigzag_direct;
                 break;
 
             case 1:
                 band->inv_transform = ff_ivi_row_slant8;
                 band->dc_transform  = ff_ivi_dc_row_slant;
-                band->scan          = ivi5_scans8x8[1];
+                band->scan          = ivi5_scans8x8[0];
                 break;
 
             case 2:
                 band->inv_transform = ff_ivi_col_slant8;
                 band->dc_transform  = ff_ivi_dc_col_slant;
-                band->scan          = ivi5_scans8x8[2];
+                band->scan          = ivi5_scans8x8[1];
                 break;
 
             case 3:
                 band->inv_transform = ff_ivi_put_pixels_8x8;
                 band->dc_transform  = ff_ivi_put_dc_pixel_8x8;
-                band->scan          = ivi5_scans8x8[2];
+                band->scan          = ivi5_scans8x8[1];
                 break;
 
             case 4:

Modified: trunk/libavcodec/indeo5data.h
==============================================================================
--- trunk/libavcodec/indeo5data.h	Fri Feb 19 17:26:21 2010	(r21896)
+++ trunk/libavcodec/indeo5data.h	Fri Feb 19 18:17:20 2010	(r21897)
@@ -40,12 +40,7 @@ static const uint8_t ivi5_common_pic_siz
 /**
  *  Indeo5 8x8 scan (zigzag) patterns
  */
-static const uint8_t ivi5_scans8x8[3][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 const uint8_t ivi5_scans8x8[2][64] = {
     {0,  8, 16, 24, 32, 40, 48, 56,  1,  9, 17, 25, 33, 41, 49, 57,
      2, 10, 18, 26, 34, 42, 50, 58,  3, 11, 19, 27, 35, 43, 51, 59,
      4, 12, 20, 28, 36, 44, 52, 60,  5, 13, 21, 29, 37, 45, 53, 61,