devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red: av_log2 undefined for ARM_ARCH <= 4, missing codeclib.h includes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23869 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-12-06 04:43:23 +00:00
parent cd22b32450
commit 50512cdeac
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/codecs/lib/codeclib.h
View file

@ -76,8 +76,7 @@ unsigned udiv32_arm(unsigned a, unsigned b);
/* TODO figure out if we really need to care about calculating /* TODO figure out if we really need to care about calculating
av_log2(0) */ av_log2(0) */
#ifdef CPU_ARM #if defined(CPU_ARM) && ARM_ARCH >= 6
#if ARM_ARCH > 5
static inline unsigned int av_log2(uint32_t v) static inline unsigned int av_log2(uint32_t v)
{ {
unsigned int r; unsigned int r;
@ -87,12 +86,11 @@ static inline unsigned int av_log2(uint32_t v)
:[r] "=r" (r) : [v] "r" (v)); :[r] "=r" (r) : [v] "r" (v));
return(r); return(r);
} }
#elif ARM_ARCH > 4 #elif defined(CPU_ARM) && ARM_ARCH >= 5
static inline unsigned int av_log2(uint32_t v) static inline unsigned int av_log2(uint32_t v)
{ {
return v ? 31 - __builtin_clz(v) : 0; return v ? 31 - __builtin_clz(v) : 0;
} }
#endif
#else /* CPU_ARM */ #else /* CPU_ARM */
/* From libavutil/common.h */ /* From libavutil/common.h */
extern const uint8_t ff_log2_tab[256] ICONST_ATTR; extern const uint8_t ff_log2_tab[256] ICONST_ATTR;

1
apps/codecs/libcook/cook.c
View file

@ -47,6 +47,7 @@
#include <stdio.h> #include <stdio.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include "codeclib.h"
#include "cook.h" #include "cook.h"
#include "cookdata.h" #include "cookdata.h"

1
apps/codecs/libffmpegFLAC/shndec.c
View file

@ -27,6 +27,7 @@
#include "bitstream.h" #include "bitstream.h"
#include "golomb.h" #include "golomb.h"
#include "shndec.h" #include "shndec.h"
#include "codeclib.h"
#define ULONGSIZE 2 #define ULONGSIZE 2