# HG changeset patch
# User mru
# Date 1268083196 0
# Node ID 41db9ae634fe078263a5262de545f82c892bbe9c
# Parent  ec7c0dcf0836bad9c9fe19eded778af44dd2c42c
Move ff_sqrt() to libavutil/intmath.h

diff -r ec7c0dcf0836 -r 41db9ae634fe internal.h
--- a/internal.h	Mon Mar 08 20:17:47 2010 +0000
+++ b/internal.h	Mon Mar 08 21:19:56 2010 +0000
@@ -128,28 +128,6 @@
 
 /* math */
 
-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);
-}
-
 #if ARCH_X86
 #define MASK_ABS(mask, level)\
             __asm__ volatile(\
diff -r ec7c0dcf0836 -r 41db9ae634fe intmath.h
--- a/intmath.h	Mon Mar 08 20:17:47 2010 +0000
+++ b/intmath.h	Mon Mar 08 21:19:56 2010 +0000
@@ -56,4 +56,26 @@
 
 #endif /* FASTDIV */
 
+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);
+}
+
 #endif /* AVUTIL_INTMATH_H */