generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)

Browse Source 
Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Marko Kreen
2002-07-10 21:01:45 +00:00
committed by Michael Niedermayer
parent 9d07682305
commit adc09b2eab
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dsputil.c
View File

@@ -46,8 +46,8 @@ op_pixels_abs_func pix_abs8x8_xy2;
UINT8 cropTbl[256 + 2 * MAX_NEG_CROP];
UINT32 squareTbl[512];
extern INT16 default_intra_matrix[64];
extern INT16 default_non_intra_matrix[64];
extern INT16 ff_mpeg1_default_intra_matrix[64];
extern INT16 ff_mpeg1_default_non_intra_matrix[64];
extern INT16 ff_mpeg4_default_intra_matrix[64];
extern INT16 ff_mpeg4_default_non_intra_matrix[64];
@@ -1322,8 +1322,8 @@ void dsputil_init(void)
j = ff_alternate_vertical_scan[i];
ff_alternate_vertical_scan[i] = block_permute_op(j);
}
block_permute(default_intra_matrix);
block_permute(default_non_intra_matrix);
block_permute(ff_mpeg1_default_intra_matrix);
block_permute(ff_mpeg1_default_non_intra_matrix);
block_permute(ff_mpeg4_default_intra_matrix);
block_permute(ff_mpeg4_default_non_intra_matrix);
}