summaryrefslogtreecommitdiff
path: root/libavutil/intmath.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-10-11 01:16:05 +0200
committerDiego Biurrun <diego@biurrun.de>2012-10-11 18:29:36 +0200
commit9734b8ba56d05e970c353dfd5baafa43fdb08024 (patch)
treee1f40e82ce4aa2ab7dc081115278057e08ffbbb6 /libavutil/intmath.h
parent0a75d1da23b8659ec49391469bb592da12760077 (diff)
Move avutil tables only used in libavcodec to libavcodec.
Diffstat (limited to 'libavutil/intmath.h')
-rw-r--r--libavutil/intmath.h35
1 files changed, 0 insertions, 35 deletions
diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index ba198c942c..0ad30123e8 100644
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -21,7 +21,6 @@
#ifndef AVUTIL_INTMATH_H
#define AVUTIL_INTMATH_H
-#include <stdint.h>
#include "config.h"
#include "attributes.h"
@@ -30,12 +29,6 @@
* @{
*/
-extern const uint32_t ff_inverse[257];
-
-#if ARCH_ARM
-# include "arm/intmath.h"
-#endif
-
#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
#ifndef av_log2
@@ -47,34 +40,6 @@ extern const uint32_t ff_inverse[257];
#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);
-}
-
/**
* @}
*/