changeset 4174:8535fcac43c1 libavcodec

rename inverse -> ff_inverse
author mru
date Sun, 12 Nov 2006 18:49:36 +0000
parents af40e7d99b8c
children b3328ed50a5e
files dsputil.c i386/mpegvideo_mmx_template.c msmpeg4.c vorbis.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dsputil.c	Sun Nov 12 13:40:40 2006 +0000
+++ b/dsputil.c	Sun Nov 12 18:49:36 2006 +0000
@@ -93,7 +93,7 @@
 };
 
 /* a*inverse[b]>>32 == a/b for all 0<=a<=65536 && 2<=b<=255 */
-const uint32_t inverse[256]={
+const uint32_t ff_inverse[256]={
          0, 4294967295U,2147483648U,1431655766, 1073741824,  858993460,  715827883,  613566757,
  536870912,  477218589,  429496730,  390451573,  357913942,  330382100,  306783379,  286331154,
  268435456,  252645136,  238609295,  226050911,  214748365,  204522253,  195225787,  186737709,
--- a/i386/mpegvideo_mmx_template.c	Sun Nov 12 13:40:40 2006 +0000
+++ b/i386/mpegvideo_mmx_template.c	Sun Nov 12 18:49:36 2006 +0000
@@ -76,7 +76,7 @@
         asm volatile (
                 "mul %%ecx                \n\t"
                 : "=d" (level), "=a"(dummy)
-                : "a" ((block[0]>>2) + q), "c" (inverse[q<<1])
+                : "a" ((block[0]>>2) + q), "c" (ff_inverse[q<<1])
         );
 #else
         asm volatile (
--- a/msmpeg4.c	Sun Nov 12 13:40:40 2006 +0000
+++ b/msmpeg4.c	Sun Nov 12 18:49:36 2006 +0000
@@ -675,7 +675,7 @@
         "mull %4                \n\t"
         "movl %%edx, %2         \n\t"
         : "+b" (a), "+c" (b), "+D" (c)
-        : "g" (scale), "S" (inverse[scale])
+        : "g" (scale), "S" (ff_inverse[scale])
         : "%eax", "%edx"
     );
 #else
--- a/vorbis.c	Sun Nov 12 13:40:40 2006 +0000
+++ b/vorbis.c	Sun Nov 12 18:49:36 2006 +0000
@@ -1438,7 +1438,7 @@
         voffset=vr->begin;
         for(partition_count=0;partition_count<ptns_to_read;) {  // SPEC        error
             if (!pass) {
-                uint_fast32_t inverse_class = inverse[vr->classifications];
+                uint_fast32_t inverse_class = ff_inverse[vr->classifications];
                 for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) {
                     if (!do_not_decode[j]) {
                         uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,