Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

[ffmpeg.git] / libavutil / intmath.h

diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 9cba406..da333bc 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -21,7 +21,6 @@
 #ifndef AVUTIL_INTMATH_H
 #define AVUTIL_INTMATH_H
 
 #ifndef AVUTIL_INTMATH_H
 #define AVUTIL_INTMATH_H
 

-#include <stdint.h>

 #include "config.h"
 #include "attributes.h"
 
 #include "config.h"
 #include "attributes.h"
 


@@ -30,12 +29,8 @@
  * @{
  */
 
  * @{
  */
 

-extern const uint32_t ff_inverse[257];
-

 #if   ARCH_ARM
 #   include "arm/intmath.h"
 #if   ARCH_ARM
 #   include "arm/intmath.h"

-#elif ARCH_X86
-#   include "x86/intmath.h"

 #endif
 
 #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
 #endif
 
 #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)


@@ -49,34 +44,6 @@ extern const uint32_t ff_inverse[257];
 
 #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
 
 
 #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
 

-#ifndef FASTDIV
-#   define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
-#endif /* FASTDIV */
-
-#include "common.h"
-
-extern const uint8_t ff_sqrt_tab[256];
-
-static inline av_const unsigned int ff_sqrt(unsigned int a)
-{
-    unsigned int b;
-
-    if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4;
-    else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2;
-#if !CONFIG_SMALL
-    else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1;
-    else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8]   ;
-#endif
-    else {
-        int s = av_log2_16bit(a >> 16) >> 1;
-        unsigned int c = a >> (s + 2);
-        b = ff_sqrt_tab[c >> (s + 8)];
-        b = FASTDIV(c,b) + (b << s);
-    }
-
-    return b - (a < b * b);
-}
-

 /**
  * @}
  */
 /**
  * @}
  */