Mercurial > libavcodec.hg

diff dsputil.c @ 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 389e30fe7269
children 3f8824eb4690
line wrap: on
line diff
--- a/dsputil.c	Wed Jul 10 20:21:00 2002 +0000
+++ b/dsputil.c	Wed Jul 10 21:01:45 2002 +0000
@@ -46,8 +46,8 @@
 UINT8 cropTbl[256 + 2 * MAX_NEG_CROP];
 UINT32 squareTbl[512];
 
-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 INT16 ff_mpeg4_default_intra_matrix[64];
 extern INT16 ff_mpeg4_default_non_intra_matrix[64];
 
@@ -1322,8 +1322,8 @@
             j = ff_alternate_vertical_scan[i];
             ff_alternate_vertical_scan[i] = block_permute_op(j);
         }
-        block_permute(default_intra_matrix);
-        block_permute(default_non_intra_matrix);
+        block_permute(ff_mpeg1_default_intra_matrix);
+        block_permute(ff_mpeg1_default_non_intra_matrix);
         block_permute(ff_mpeg4_default_intra_matrix);
         block_permute(ff_mpeg4_default_non_intra_matrix);
     }