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/mpeg12data.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/mpeg12data.h')
| -rw-r--r-- | libavcodec/mpeg12data.h | 4 |
1 files changed, 2 insertions, 2 deletions
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, |