diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-12-06 04:43:23 +0000 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-12-06 04:43:23 +0000 |
| commit | 50512cdeacdc66bd13c5848d15bf005ee3b456cd (patch) | |
| tree | cc28278f08d1ef36f62e63199c30aa11df49482d | |
| parent | cd22b32450757b5c204bca9add59b177c27cf4e7 (diff) | |
| download | rockbox-50512cdeacdc66bd13c5848d15bf005ee3b456cd.zip rockbox-50512cdeacdc66bd13c5848d15bf005ee3b456cd.tar.gz rockbox-50512cdeacdc66bd13c5848d15bf005ee3b456cd.tar.bz2 rockbox-50512cdeacdc66bd13c5848d15bf005ee3b456cd.tar.xz | |
Fix red: av_log2 undefined for ARM_ARCH <= 4, missing codeclib.h includes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23869 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/codecs/lib/codeclib.h | 6 | ||||
| -rw-r--r-- | apps/codecs/libcook/cook.c | 1 | ||||
| -rw-r--r-- | apps/codecs/libffmpegFLAC/shndec.c | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 4f30b30..9c3624b 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h @@ -76,8 +76,7 @@ unsigned udiv32_arm(unsigned a, unsigned b); /* TODO figure out if we really need to care about calculating av_log2(0) */ -#ifdef CPU_ARM -#if ARM_ARCH > 5 +#if defined(CPU_ARM) && ARM_ARCH >= 6 static inline unsigned int av_log2(uint32_t v) { unsigned int r; @@ -87,12 +86,11 @@ static inline unsigned int av_log2(uint32_t v) :[r] "=r" (r) : [v] "r" (v)); return(r); } -#elif ARM_ARCH > 4 +#elif defined(CPU_ARM) && ARM_ARCH >= 5 static inline unsigned int av_log2(uint32_t v) { return v ? 31 - __builtin_clz(v) : 0; } -#endif #else /* CPU_ARM */ /* From libavutil/common.h */ extern const uint8_t ff_log2_tab[256] ICONST_ATTR; diff --git a/apps/codecs/libcook/cook.c b/apps/codecs/libcook/cook.c index 74f695e..3212c57 100644 --- a/apps/codecs/libcook/cook.c +++ b/apps/codecs/libcook/cook.c @@ -47,6 +47,7 @@ #include <stdio.h> #include <limits.h> #include <string.h> +#include "codeclib.h" #include "cook.h" #include "cookdata.h" diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c index 1afcff6..fb11f77 100644 --- a/apps/codecs/libffmpegFLAC/shndec.c +++ b/apps/codecs/libffmpegFLAC/shndec.c @@ -27,6 +27,7 @@ #include "bitstream.h" #include "golomb.h" #include "shndec.h" +#include "codeclib.h" #define ULONGSIZE 2 |