Revision 9c6b3b97

View differences:

libavcodec/indeo5.c
185 185
            case 1:
186 186
                band->inv_transform = ff_ivi_row_slant8;
187 187
                band->dc_transform  = ff_ivi_dc_row_slant;
188
                band->scan          = ivi_vertical_scan_8x8;
188
                band->scan          = ff_ivi_vertical_scan_8x8;
189 189
                break;
190 190

  
191 191
            case 2:
192 192
                band->inv_transform = ff_ivi_col_slant8;
193 193
                band->dc_transform  = ff_ivi_dc_col_slant;
194
                band->scan          = ivi_horizontal_scan_8x8;
194
                band->scan          = ff_ivi_horizontal_scan_8x8;
195 195
                break;
196 196

  
197 197
            case 3:
198 198
                band->inv_transform = ff_ivi_put_pixels_8x8;
199 199
                band->dc_transform  = ff_ivi_put_dc_pixel_8x8;
200
                band->scan          = ivi_horizontal_scan_8x8;
200
                band->scan          = ff_ivi_horizontal_scan_8x8;
201 201
                break;
202 202

  
203 203
            case 4:
204 204
                band->inv_transform = ff_ivi_inverse_slant_4x4;
205 205
                band->dc_transform  = ff_ivi_dc_slant_2d;
206
                band->scan          = ivi_direct_scan_4x4;
206
                band->scan          = ff_ivi_direct_scan_4x4;
207 207
                break;
208 208
            }
209 209

  
libavcodec/ivi_common.c
645 645
/**
646 646
 *  Scan patterns shared between indeo4 and indeo5
647 647
 */
648
const uint8_t ivi_vertical_scan_8x8[64] = {
648
const uint8_t ff_ivi_vertical_scan_8x8[64] = {
649 649
    0,  8, 16, 24, 32, 40, 48, 56,
650 650
    1,  9, 17, 25, 33, 41, 49, 57,
651 651
    2, 10, 18, 26, 34, 42, 50, 58,
......
656 656
    7, 15, 23, 31, 39, 47, 55, 63
657 657
};
658 658

  
659
const uint8_t ivi_horizontal_scan_8x8[64] = {
659
const uint8_t ff_ivi_horizontal_scan_8x8[64] = {
660 660
     0,  1,  2,  3,  4,  5,  6,  7,
661 661
     8,  9, 10, 11, 12, 13, 14, 15,
662 662
    16, 17, 18, 19, 20, 21, 22, 23,
......
667 667
    56, 57, 58, 59, 60, 61, 62, 63
668 668
};
669 669

  
670
const uint8_t ivi_direct_scan_4x4[16] = {
670
const uint8_t ff_ivi_direct_scan_4x4[16] = {
671 671
    0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
672 672
};
673 673

  
libavcodec/ivi_common.h
70 70
/**
71 71
 *  Common scan patterns (defined in ivi_common.c)
72 72
 */
73
extern const uint8_t ivi_vertical_scan_8x8[64];
74
extern const uint8_t ivi_horizontal_scan_8x8[64];
75
extern const uint8_t ivi_direct_scan_4x4[16];
73
extern const uint8_t ff_ivi_vertical_scan_8x8[64];
74
extern const uint8_t ff_ivi_horizontal_scan_8x8[64];
75
extern const uint8_t ff_ivi_direct_scan_4x4[16];
76 76

  
77 77

  
78 78
/**

Also available in: Unified diff