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.h | |
| 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.h')
| -rw-r--r-- | src/libfaad/common.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libfaad/common.h b/src/libfaad/common.h index aa40ebe0a..577f54368 100644 --- a/src/libfaad/common.h +++ b/src/libfaad/common.h @@ -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.h,v 1.9 2003/12/30 02:00:10 miguelfreitas Exp $ +** $Id: common.h,v 1.10 2004/01/11 15:44:04 mroi Exp $ **/ #ifndef __COMMON_H__ @@ -33,7 +33,7 @@ extern "C" { #endif #define INLINE __inline -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_WIN32_WCE) #define ALIGN __declspec(align(16)) #else #define ALIGN @@ -120,7 +120,7 @@ extern "C" { #if ((defined(_WIN32) && !defined(_WIN32_WCE)) /* || ((__GNUC__ >= 3) && defined(__i386__)) */ ) #ifndef FIXED_POINT /* includes <xmmintrin.h> to enable SSE intrinsics */ -#define USE_SSE +//#define USE_SSE #endif #endif @@ -289,6 +289,7 @@ char *strchr(), *strrchr(); *y2 = MUL_F(x2, c1) - MUL_F(x1, c2); } + #ifndef HAVE_LRINTF #ifdef _WIN32 #define HAS_LRINTF @@ -318,6 +319,7 @@ char *strchr(), *strrchr(); #endif #endif + #ifdef __ICL /* only Intel C compiler has fmath ??? */ #include <mathf.h> @@ -379,7 +381,7 @@ typedef real_t complex_t[2]; /* common functions */ -uint8_t cpu_has_sse(); +uint8_t cpu_has_sse(void); uint32_t random_int(void); uint8_t get_sr_index(const uint32_t samplerate); uint8_t max_pred_sfb(const uint8_t sr_index); |