diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:35:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:35:42 +0400 |
commit | d6c342fdc0b434b514f99e1feaa108ab17bba806 (patch) | |
tree | 244b8c09cff87b34e1c94cfe3e8e2e15b415ce3c /libavutil | |
parent | d197bd4f5ee752c95ebaf7d94257ca5121309674 (diff) | |
parent | d5c62122a7b26704bf867a1262df358623bf5edf (diff) |
Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
* commit 'd5c62122a7b26704bf867a1262df358623bf5edf':
Move av_reverse table to libavcodec
Conflicts:
libavcodec/asvenc.c
libavcodec/vble.c
libavutil/common.h
libavutil/mathematics.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/common.h | 6 | ||||
-rw-r--r-- | libavutil/mathematics.c | 4 | ||||
-rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 3e3baab3a1..9ed6f11468 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -34,7 +34,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + #include "attributes.h" +#include "version.h" #include "libavutil/avconfig.h" #if AV_HAVE_BIGENDIAN @@ -67,7 +69,9 @@ extern const uint8_t ff_log2_tab[256]; /** * Reverse the order of the bits of an 8-bits unsigned integer. */ -extern const uint8_t av_reverse[256]; +#if FF_API_AV_REVERSE +extern attribute_deprecated const uint8_t av_reverse[256]; +#endif static av_always_inline av_const int av_log2_c(unsigned int v) { diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c index e4df329099..bf93437f02 100644 --- a/libavutil/mathematics.c +++ b/libavutil/mathematics.c @@ -25,10 +25,13 @@ #include <stdint.h> #include <limits.h> + #include "mathematics.h" #include "libavutil/common.h" #include "avassert.h" +#include "version.h" +#if FF_API_AV_REVERSE const uint8_t av_reverse[256]={ 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, @@ -47,6 +50,7 @@ const uint8_t av_reverse[256]={ 0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, 0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF, }; +#endif int64_t av_gcd(int64_t a, int64_t b){ if(b) return av_gcd(b, a%b); diff --git a/libavutil/version.h b/libavutil/version.h index 25dd42dd66..4751af3f79 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -90,6 +90,9 @@ #ifndef FF_API_PIX_FMT_DESC #define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 52) #endif +#ifndef FF_API_AV_REVERSE +#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 52) +#endif /** * @} |