diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-01-11 15:44:04 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-01-11 15:44:04 +0000 |
| commit | ba65efaad16ddd1347de7af98f9494cee7a39419 (patch) | |
| tree | 630d2e9b4581f45cbe85815ec881705be9cc045b /src/libfaad/common.c | |
| parent | 14019fd4a433078fb4466e910cd432489dd60bbc (diff) | |
| download | xine-lib-ba65efaad16ddd1347de7af98f9494cee7a39419.tar.gz xine-lib-ba65efaad16ddd1347de7af98f9494cee7a39419.tar.bz2 | |
the faad project accepted a huge compiler warning patch I sent them,
merging their CVS back to our copy
everyone please check, if your AAC samples still work
CVS patchset: 6024
CVS date: 2004/01/11 15:44:04
Diffstat (limited to 'src/libfaad/common.c')
| -rw-r--r-- | src/libfaad/common.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libfaad/common.c b/src/libfaad/common.c index 3df232482..a5135a05f 100644 --- a/src/libfaad/common.c +++ b/src/libfaad/common.c @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: common.c,v 1.4 2003/12/30 02:00:10 miguelfreitas Exp $ +** $Id: common.c,v 1.5 2004/01/11 15:44:04 mroi Exp $ **/ /* just some common functions that could be used anywhere */ @@ -34,7 +34,7 @@ #include "syntax.h" #ifdef USE_SSE -__declspec(naked) static int32_t __fastcall test_cpuid() +__declspec(naked) static int32_t __fastcall test_cpuid(void) { __asm { @@ -233,7 +233,7 @@ int8_t can_decode_ot(const uint8_t object_type) /* common malloc function */ void *faad_malloc(int32_t size) { -#ifdef _WIN32 +#if 0 // defined(_WIN32) && !defined(_WIN32_WCE) return _aligned_malloc(size, 16); #else return malloc(size); @@ -243,7 +243,7 @@ void *faad_malloc(int32_t size) /* common free function */ void faad_free(void *b) { -#ifdef _WIN32 +#if 0 // defined(_WIN32) && !defined(_WIN32_WCE) _aligned_free(b); #else free(b); @@ -293,7 +293,6 @@ static uint32_t __r2 = 1; */ uint32_t random_int(void) { - static const uint32_t rnd_seed = 16428320; uint32_t t1, t2, t3, t4; t3 = t1 = __r1; t4 = t2 = __r2; // Parity calculation is done via table lookup, this is also available |