@@ -30,6 +30,7 @@

 #include <stdlib.h>

 #include <stdio.h>

 #include <limits.h>

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "dsputil.h"

 #include "mathops.h"

@@ -27,6 +27,7 @@

  * The simplest mpeg encoder (well, it was the simplest!).

  */

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "dsputil.h"

 #include "mpegvideo.h"

@@ -27,6 +27,7 @@

  * The simplest mpeg encoder (well, it was the simplest!).

  */

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "dsputil.h"

 #include "mpegvideo.h"

@@ -22,6 +22,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "get_bits.h"

 #include "ra144.h"

@@ -25,6 +25,7 @@

  * Rate control for video encoders.

  */

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "dsputil.h"

 #include "ratecontrol.h"

@@ -21,6 +21,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "bytestream.h"

@@ -18,6 +18,7 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+#include "libavutil/intmath.h"

 #include "avcodec.h"

 #include "dsputil.h"

 #include "snow.h"

@@ -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(\

@@ -56,4 +56,26 @@ extern const uint32_t ff_inverse[257];

 #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 */