From adc09b2eab2933d1fe75f09f4f81b2d0f3d1ed1c Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Wed, 10 Jul 2002 21:01:45 +0000 Subject: adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen ) Originally committed as revision 739 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mpegvideo.h') diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 83a6bd877b..cce073b9b2 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -471,8 +471,8 @@ void ff_fix_long_p_mvs(MpegEncContext * s); void ff_fix_long_b_mvs(MpegEncContext * s, int16_t (*mv_table)[2], int f_code, int type); /* mpeg12.c */ -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 UINT8 ff_mpeg1_dc_scale_table[128]; void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); -- cgit v1.2.3