[FFmpeg-cvslog] r23341 - in trunk/libavcodec: indeo5.c ivi_common.c ivi_common.h

[maxim]

Author: maxim
Date: Wed May 26 22:22:29 2010
New Revision: 23341

Log:
Add the forgotten ff_ prefix to the shareable scan patterns.

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

Modified: trunk/libavcodec/indeo5.c
==============================================================================
--- trunk/libavcodec/indeo5.c	Wed May 26 21:00:59 2010	(r23340)
+++ trunk/libavcodec/indeo5.c	Wed May 26 22:22:29 2010	(r23341)
@@ -185,25 +185,25 @@ static int decode_gop_header(IVI5DecCont
             case 1:
                 band->inv_transform = ff_ivi_row_slant8;
                 band->dc_transform  = ff_ivi_dc_row_slant;
-                band->scan          = ivi_vertical_scan_8x8;
+                band->scan          = ff_ivi_vertical_scan_8x8;
                 break;
 
             case 2:
                 band->inv_transform = ff_ivi_col_slant8;
                 band->dc_transform  = ff_ivi_dc_col_slant;
-                band->scan          = ivi_horizontal_scan_8x8;
+                band->scan          = ff_ivi_horizontal_scan_8x8;
                 break;
 
             case 3:
                 band->inv_transform = ff_ivi_put_pixels_8x8;
                 band->dc_transform  = ff_ivi_put_dc_pixel_8x8;
-                band->scan          = ivi_horizontal_scan_8x8;
+                band->scan          = ff_ivi_horizontal_scan_8x8;
                 break;
 
             case 4:
                 band->inv_transform = ff_ivi_inverse_slant_4x4;
                 band->dc_transform  = ff_ivi_dc_slant_2d;
-                band->scan          = ivi_direct_scan_4x4;
+                band->scan          = ff_ivi_direct_scan_4x4;
                 break;
             }
 

Modified: trunk/libavcodec/ivi_common.c
==============================================================================
--- trunk/libavcodec/ivi_common.c	Wed May 26 21:00:59 2010	(r23340)
+++ trunk/libavcodec/ivi_common.c	Wed May 26 22:22:29 2010	(r23341)
@@ -645,7 +645,7 @@ const IVIHuffDesc ff_ivi_blk_huff_desc[8
 /**
  *  Scan patterns shared between indeo4 and indeo5
  */
-const uint8_t ivi_vertical_scan_8x8[64] = {
+const uint8_t ff_ivi_vertical_scan_8x8[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,
@@ -656,7 +656,7 @@ const uint8_t ivi_vertical_scan_8x8[64] 
     7, 15, 23, 31, 39, 47, 55, 63
 };
 
-const uint8_t ivi_horizontal_scan_8x8[64] = {
+const uint8_t ff_ivi_horizontal_scan_8x8[64] = {
      0,  1,  2,  3,  4,  5,  6,  7,
      8,  9, 10, 11, 12, 13, 14, 15,
     16, 17, 18, 19, 20, 21, 22, 23,
@@ -667,7 +667,7 @@ const uint8_t ivi_horizontal_scan_8x8[64
     56, 57, 58, 59, 60, 61, 62, 63
 };
 
-const uint8_t ivi_direct_scan_4x4[16] = {
+const uint8_t ff_ivi_direct_scan_4x4[16] = {
     0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
 };
 

Modified: trunk/libavcodec/ivi_common.h
==============================================================================
--- trunk/libavcodec/ivi_common.h	Wed May 26 21:00:59 2010	(r23340)
+++ trunk/libavcodec/ivi_common.h	Wed May 26 22:22:29 2010	(r23341)
@@ -70,9 +70,9 @@ extern VLC ff_ivi_blk_vlc_tabs[8]; ///< 
 /**
  *  Common scan patterns (defined in ivi_common.c)
  */
-extern const uint8_t ivi_vertical_scan_8x8[64];
-extern const uint8_t ivi_horizontal_scan_8x8[64];
-extern const uint8_t ivi_direct_scan_4x4[16];
+extern const uint8_t ff_ivi_vertical_scan_8x8[64];
+extern const uint8_t ff_ivi_horizontal_scan_8x8[64];
+extern const uint8_t ff_ivi_direct_scan_4x4[16];
 
 
 /**