virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Add the forgotten ff_ prefix to the shareable scan patterns.

Browse Source 
Originally committed as revision 23341 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Maxim Poliakovski 2010-05-26 20:22:29 +00:00
parent 05e953193d
commit 9c6b3b97d7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/indeo5.c
View File

@ -185,25 +185,25 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx)
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;
}

6
libavcodec/ivi_common.c
View File

@ -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
};

6
libavcodec/ivi_common.h
View File

@ -70,9 +70,9 @@ extern VLC ff_ivi_blk_vlc_tabs[8]; ///< static block Huffman tables
/**
* 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];
/**