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
This commit is contained in:
Marko Kreen 2002-07-10 21:01:45 +00:00 committed by Michael Niedermayer
parent 9d07682305
commit adc09b2eab
5 changed files with 15 additions and 15 deletions

View file

@ -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,