diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libffmpegFLAC/golomb.h | 11 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/tables.c | 14 |
2 files changed, 15 insertions, 10 deletions
diff --git a/apps/codecs/libffmpegFLAC/golomb.h b/apps/codecs/libffmpegFLAC/golomb.h index 2739f38086..57e84f4e57 100644 --- a/apps/codecs/libffmpegFLAC/golomb.h +++ b/apps/codecs/libffmpegFLAC/golomb.h | |||
@@ -22,16 +22,7 @@ | |||
22 | #include <limits.h> | 22 | #include <limits.h> |
23 | 23 | ||
24 | /* From libavutil/common.h */ | 24 | /* From libavutil/common.h */ |
25 | const uint8_t ff_log2_tab[256] ICONST_ATTR = { | 25 | extern const uint8_t ff_log2_tab[256]; |
26 | 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, | ||
27 | 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, | ||
28 | 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | ||
29 | 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | ||
30 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
31 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
32 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
33 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 | ||
34 | }; | ||
35 | 26 | ||
36 | static inline int av_log2(unsigned int v) | 27 | static inline int av_log2(unsigned int v) |
37 | { | 28 | { |
diff --git a/apps/codecs/libffmpegFLAC/tables.c b/apps/codecs/libffmpegFLAC/tables.c new file mode 100644 index 0000000000..8422bf75e1 --- /dev/null +++ b/apps/codecs/libffmpegFLAC/tables.c | |||
@@ -0,0 +1,14 @@ | |||
1 | #include "../codec.h" | ||
2 | #include <inttypes.h> | ||
3 | |||
4 | /* From ffmpeg - libavutil/common.h */ | ||
5 | const uint8_t ff_log2_tab[256] ICONST_ATTR = { | ||
6 | 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, | ||
7 | 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, | ||
8 | 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | ||
9 | 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | ||
10 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
11 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
12 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
13 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 | ||
14 | }; | ||