forked from len0rd/rockbox
Define and use a local APE_MAX function to make the standalone demac decoder compile again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13601 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
bcac36468f
commit
6131996538
1 changed files with 7 additions and 2 deletions
|
|
@ -35,6 +35,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
|
||||||
|
|
||||||
#include "parser.h"
|
#include "parser.h"
|
||||||
|
|
||||||
|
#ifdef APE_MAX
|
||||||
|
#undef APE_MAX
|
||||||
|
#endif
|
||||||
|
#define APE_MAX(a,b) ((a)>(b)?(a):(b))
|
||||||
|
|
||||||
|
|
||||||
static inline int16_t get_int16(unsigned char* buf)
|
static inline int16_t get_int16(unsigned char* buf)
|
||||||
{
|
{
|
||||||
|
|
@ -148,8 +153,8 @@ int ape_parseheaderbuf(unsigned char* buf, struct ape_ctx_t* ape_ctx)
|
||||||
if (ape_ctx->totalframes > 1)
|
if (ape_ctx->totalframes > 1)
|
||||||
ape_ctx->totalsamples += ape_ctx->blocksperframe * (ape_ctx->totalframes-1);
|
ape_ctx->totalsamples += ape_ctx->blocksperframe * (ape_ctx->totalframes-1);
|
||||||
|
|
||||||
ape_ctx->numseekpoints = MAX(ape_ctx->maxseekpoints,
|
ape_ctx->numseekpoints = APE_MAX(ape_ctx->maxseekpoints,
|
||||||
ape_ctx->seektablelength / sizeof(int32_t));
|
ape_ctx->seektablelength / sizeof(int32_t));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue