Mercurial > libavcodec.hg

diff mpeg12.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 19a5e2a81e1a
children 6df843af36cb
line wrap: on
line diff
--- a/mpeg12.c	Wed Jul 10 20:21:00 2002 +0000
+++ b/mpeg12.c	Wed Jul 10 21:01:45 2002 +0000
@@ -1540,7 +1540,7 @@
 #endif
     } else {
         for(i=0;i<64;i++) {
-            v = default_intra_matrix[i];
+            v = ff_mpeg1_default_intra_matrix[i];
             s->intra_matrix[i] = v;
             s->chroma_intra_matrix[i] = v;
         }
@@ -1560,7 +1560,7 @@
 #endif
     } else {
         for(i=0;i<64;i++) {
-            v = default_non_intra_matrix[i];
+            v = ff_mpeg1_default_non_intra_matrix[i];
             s->inter_matrix[i] = v;
             s->chroma_inter_matrix[i] = v;
         }