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/mpegvideo.h | |
| parent | 9d076823059f3d1f84ab2575b94fc9c325584dc2 (diff) | |
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/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |