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/mpeg12data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mpeg12data.h') diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index cfb6e1d0f6..041708fd1f 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -2,7 +2,7 @@ * MPEG1/2 tables */ -INT16 default_intra_matrix[64] = { +INT16 ff_mpeg1_default_intra_matrix[64] = { 8, 16, 19, 22, 26, 27, 29, 34, 16, 16, 22, 24, 27, 29, 34, 37, 19, 22, 26, 27, 29, 34, 34, 38, @@ -13,7 +13,7 @@ INT16 default_intra_matrix[64] = { 27, 29, 35, 38, 46, 56, 69, 83 }; -INT16 default_non_intra_matrix[64] = { +INT16 ff_mpeg1_default_non_intra_matrix[64] = { 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, -- cgit v1.2.3