Commit f460a5b4 authored by maxim's avatar maxim

Add the forgotten ff_ prefix to the shareable scan patterns.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23341 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d0d39b6c
...@@ -185,25 +185,25 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx) ...@@ -185,25 +185,25 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx)
case 1: case 1:
band->inv_transform = ff_ivi_row_slant8; band->inv_transform = ff_ivi_row_slant8;
band->dc_transform = ff_ivi_dc_row_slant; band->dc_transform = ff_ivi_dc_row_slant;
band->scan = ivi_vertical_scan_8x8; band->scan = ff_ivi_vertical_scan_8x8;
break; break;
case 2: case 2:
band->inv_transform = ff_ivi_col_slant8; band->inv_transform = ff_ivi_col_slant8;
band->dc_transform = ff_ivi_dc_col_slant; band->dc_transform = ff_ivi_dc_col_slant;
band->scan = ivi_horizontal_scan_8x8; band->scan = ff_ivi_horizontal_scan_8x8;
break; break;
case 3: case 3:
band->inv_transform = ff_ivi_put_pixels_8x8; band->inv_transform = ff_ivi_put_pixels_8x8;
band->dc_transform = ff_ivi_put_dc_pixel_8x8; band->dc_transform = ff_ivi_put_dc_pixel_8x8;
band->scan = ivi_horizontal_scan_8x8; band->scan = ff_ivi_horizontal_scan_8x8;
break; break;
case 4: case 4:
band->inv_transform = ff_ivi_inverse_slant_4x4; band->inv_transform = ff_ivi_inverse_slant_4x4;
band->dc_transform = ff_ivi_dc_slant_2d; band->dc_transform = ff_ivi_dc_slant_2d;
band->scan = ivi_direct_scan_4x4; band->scan = ff_ivi_direct_scan_4x4;
break; break;
} }
......
...@@ -645,7 +645,7 @@ const IVIHuffDesc ff_ivi_blk_huff_desc[8] = { ...@@ -645,7 +645,7 @@ const IVIHuffDesc ff_ivi_blk_huff_desc[8] = {
/** /**
* Scan patterns shared between indeo4 and indeo5 * 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, 0, 8, 16, 24, 32, 40, 48, 56,
1, 9, 17, 25, 33, 41, 49, 57, 1, 9, 17, 25, 33, 41, 49, 57,
2, 10, 18, 26, 34, 42, 50, 58, 2, 10, 18, 26, 34, 42, 50, 58,
...@@ -656,7 +656,7 @@ const uint8_t ivi_vertical_scan_8x8[64] = { ...@@ -656,7 +656,7 @@ const uint8_t ivi_vertical_scan_8x8[64] = {
7, 15, 23, 31, 39, 47, 55, 63 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, 0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 16, 17, 18, 19, 20, 21, 22, 23,
...@@ -667,7 +667,7 @@ const uint8_t ivi_horizontal_scan_8x8[64] = { ...@@ -667,7 +667,7 @@ const uint8_t ivi_horizontal_scan_8x8[64] = {
56, 57, 58, 59, 60, 61, 62, 63 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 0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
}; };
......
...@@ -70,9 +70,9 @@ extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables ...@@ -70,9 +70,9 @@ extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables
/** /**
* Common scan patterns (defined in ivi_common.c) * Common scan patterns (defined in ivi_common.c)
*/ */
extern const uint8_t ivi_vertical_scan_8x8[64]; extern const uint8_t ff_ivi_vertical_scan_8x8[64];
extern const uint8_t ivi_horizontal_scan_8x8[64]; extern const uint8_t ff_ivi_horizontal_scan_8x8[64];
extern const uint8_t ivi_direct_scan_4x4[16]; extern const uint8_t ff_ivi_direct_scan_4x4[16];
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment