diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 13:29:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 13:35:42 +0200 |
| commit | dcbff35199e1596d9d1200e734ef4a4c306e50f1 (patch) | |
| tree | e173e3208ed6a79a0648e4324c3cc398b7d176ca /libavutil/common.h | |
| parent | 05f228b0a01e8b97ba73a15c1eccb6b0a9060633 (diff) | |
| parent | d15c21e5fa3961f10026da1a3080a3aa3cf4cec9 (diff) | |
Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
avutil: make some tables visible again
avutil: remove inline av_log2 from public API
celp_math: rename ff_log2 to ff_log2_q15
Conflicts:
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/common.h')
| -rw-r--r-- | libavutil/common.h | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 9ed6f11468..c2a54c4987 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -64,7 +64,6 @@ #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) /* misc math functions */ -extern const uint8_t ff_log2_tab[256]; /** * Reverse the order of the bits of an 8-bits unsigned integer. @@ -73,34 +72,6 @@ extern const uint8_t ff_log2_tab[256]; extern attribute_deprecated const uint8_t av_reverse[256]; #endif -static av_always_inline av_const int av_log2_c(unsigned int v) -{ - int n = 0; - if (v & 0xffff0000) { - v >>= 16; - n += 16; - } - if (v & 0xff00) { - v >>= 8; - n += 8; - } - n += ff_log2_tab[v]; - - return n; -} - -static av_always_inline av_const int av_log2_16bit_c(unsigned int v) -{ - int n = 0; - if (v & 0xff00) { - v >>= 8; - n += 8; - } - n += ff_log2_tab[v]; - - return n; -} - #ifdef HAVE_AV_CONFIG_H # include "config.h" # include "intmath.h" @@ -109,6 +80,14 @@ static av_always_inline av_const int av_log2_16bit_c(unsigned int v) /* Pull in unguarded fallback defines at the end of this file. */ #include "common.h" +#ifndef av_log2 +av_const int av_log2(unsigned v); +#endif + +#ifndef av_log2_16bit +av_const int av_log2_16bit(unsigned v); +#endif + /** * Clip a signed integer value into the amin-amax range. * @param a value to clip @@ -390,12 +369,6 @@ static av_always_inline av_const int av_popcount64_c(uint64_t x) * to ensure they are immediately available in intmath.h. */ -#ifndef av_log2 -# define av_log2 av_log2_c -#endif -#ifndef av_log2_16bit -# define av_log2_16bit av_log2_16bit_c -#endif #ifndef av_ceil_log2 # define av_ceil_log2 av_ceil_log2_c #endif |