[Ffmpeg-cvslog] r6990 - in trunk: libavcodec/dsputil.c libavcodec/i386/mpegvideo_mmx_template.c libavcodec/msmpeg4.c libavcodec/vorbis.c libavutil/internal.h

[mru]

Author: mru
Date: Sun Nov 12 19:49:36 2006
New Revision: 6990

Modified:
   trunk/libavcodec/dsputil.c
   trunk/libavcodec/i386/mpegvideo_mmx_template.c
   trunk/libavcodec/msmpeg4.c
   trunk/libavcodec/vorbis.c
   trunk/libavutil/internal.h

Log:
rename inverse -> ff_inverse


Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c	(original)
+++ trunk/libavcodec/dsputil.c	Sun Nov 12 19:49:36 2006
@@ -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,

Modified: trunk/libavcodec/i386/mpegvideo_mmx_template.c
==============================================================================
--- trunk/libavcodec/i386/mpegvideo_mmx_template.c	(original)
+++ trunk/libavcodec/i386/mpegvideo_mmx_template.c	Sun Nov 12 19:49:36 2006
@@ -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 (

Modified: trunk/libavcodec/msmpeg4.c
==============================================================================
--- trunk/libavcodec/msmpeg4.c	(original)
+++ trunk/libavcodec/msmpeg4.c	Sun Nov 12 19:49:36 2006
@@ -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

Modified: trunk/libavcodec/vorbis.c
==============================================================================
--- trunk/libavcodec/vorbis.c	(original)
+++ trunk/libavcodec/vorbis.c	Sun Nov 12 19:49:36 2006
@@ -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,

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	(original)
+++ trunk/libavutil/internal.h	Sun Nov 12 19:49:36 2006
@@ -103,7 +103,7 @@
 
 #    define av_abort()      do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)
 
-extern const uint32_t inverse[256];
+extern const uint32_t ff_inverse[256];
 
 #if defined(ARCH_X86)
 #    define FASTDIV(a,b) \
@@ -112,7 +112,7 @@
         asm volatile(\
             "mull %3"\
             :"=d"(ret),"=a"(dmy)\
-            :"1"(a),"g"(inverse[b])\
+            :"1"(a),"g"(ff_inverse[b])\
             );\
         ret;\
     })
@@ -123,12 +123,12 @@
         asm volatile(\
             "umull %1, %0, %2, %3"\
             :"=&r"(ret),"=&r"(dmy)\
-            :"r"(a),"r"(inverse[b])\
+            :"r"(a),"r"(ff_inverse[b])\
             );\
         ret;\
     })
 #elif defined(CONFIG_FASTDIV)
-#    define FASTDIV(a,b)   ((uint32_t)((((uint64_t)a)*inverse[b])>>32))
+#    define FASTDIV(a,b)   ((uint32_t)((((uint64_t)a)*ff_inverse[b])>>32))
 #else
 #    define FASTDIV(a,b)   ((a)/(b))
 #endif