diff options
| author | Marko Kreen <marko@l-t.ee> | 2002-07-10 21:01:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-07-10 21:01:45 +0000 |
| commit | adc09b2eab2933d1fe75f09f4f81b2d0f3d1ed1c (patch) | |
| tree | 644388704ddbb7cbbca5a10d192da8b8f6aea695 /libavcodec/dsputil.c | |
| parent | 9d076823059f3d1f84ab2575b94fc9c325584dc2 (diff) | |
| download | ffmpeg-adc09b2eab2933d1fe75f09f4f81b2d0f3d1ed1c.tar.gz | |
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index e1a4e9c291..c832939ccf 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -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); } |