Mercurial > libavcodec.hg

diff mpegvideo.h @ 533:3c07cf9595de libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
author michaelni
date Wed, 10 Jul 2002 21:01:45 +0000
parents 55b4e2248a45
children d55978a3c369
line wrap: on
line diff
--- a/mpegvideo.h	Wed Jul 10 20:21:00 2002 +0000
+++ b/mpegvideo.h	Wed Jul 10 21:01:45 2002 +0000
@@ -471,8 +471,8 @@
 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);