diff options
-rw-r--r-- | apps/codecs/libffmpegFLAC/SOURCES | 2 | ||||
-rw-r--r-- | apps/codecs/libffmpegFLAC/golomb.h | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/apps/codecs/libffmpegFLAC/SOURCES b/apps/codecs/libffmpegFLAC/SOURCES index 688cd3bce7..823a2b7744 100644 --- a/apps/codecs/libffmpegFLAC/SOURCES +++ b/apps/codecs/libffmpegFLAC/SOURCES | |||
@@ -1,7 +1,9 @@ | |||
1 | bitstream.c | 1 | bitstream.c |
2 | decoder.c | 2 | decoder.c |
3 | shndec.c | 3 | shndec.c |
4 | #if !(defined(CPU_ARM) && (ARM_ARCH > 4)) | ||
4 | tables.c | 5 | tables.c |
6 | #endif | ||
5 | #if defined(CPU_COLDFIRE) | 7 | #if defined(CPU_COLDFIRE) |
6 | coldfire.S | 8 | coldfire.S |
7 | #elif defined(CPU_ARM) | 9 | #elif defined(CPU_ARM) |
diff --git a/apps/codecs/libffmpegFLAC/golomb.h b/apps/codecs/libffmpegFLAC/golomb.h index 659ecc1579..11753fc4bb 100644 --- a/apps/codecs/libffmpegFLAC/golomb.h +++ b/apps/codecs/libffmpegFLAC/golomb.h | |||
@@ -21,6 +21,13 @@ | |||
21 | 21 | ||
22 | #include <limits.h> | 22 | #include <limits.h> |
23 | 23 | ||
24 | #if (defined(CPU_ARM) && (ARM_ARCH > 4)) | ||
25 | static inline int av_log2(uint32_t v) | ||
26 | { | ||
27 | return 31 - __builtin_clz(v); | ||
28 | } | ||
29 | #else | ||
30 | |||
24 | /* From libavutil/common.h */ | 31 | /* From libavutil/common.h */ |
25 | extern const uint8_t ff_log2_tab[256]; | 32 | extern const uint8_t ff_log2_tab[256]; |
26 | 33 | ||
@@ -41,6 +48,7 @@ static inline int av_log2(unsigned int v) | |||
41 | 48 | ||
42 | return n; | 49 | return n; |
43 | } | 50 | } |
51 | #endif | ||
44 | 52 | ||
45 | /** | 53 | /** |
46 | * @file golomb.h | 54 | * @file golomb.h |