diff --git a/ThirdParty/fdk-aac/include/fdk-aac/machine_type.h b/ThirdParty/fdk-aac/include/fdk-aac/machine_type.h index 8b4cae176..c916d6a8f 100644 --- a/ThirdParty/fdk-aac/include/fdk-aac/machine_type.h +++ b/ThirdParty/fdk-aac/include/fdk-aac/machine_type.h @@ -117,20 +117,8 @@ typedef unsigned long long uint64_t; /* Library calling convention spec. __cdecl and friends might be added here as * required. */ - -#if 0 -#ifdef FDKAAC_EXPORTS -#define LINKSPEC_H __declspec(dllexport) -#define LINKSPEC_CPP __declspec(dllexport) - -#else -#define LINKSPEC_H __declspec(dllimport) -#define LINKSPEC_CPP __declspec(dllimport) -#endif -#else #define LINKSPEC_H #define LINKSPEC_CPP -#endif /* for doxygen the following docu parts must be separated */ /** \var SCHAR @@ -235,24 +223,11 @@ typedef unsigned long long UINT64; #define FDK_ASSERT(ignore) #endif -#if 0 -//typedef SHORT INT_PCM; -typedef LONG INT_PCM; -#define MAXVAL_PCM MAXVAL_SGL -#define MINVAL_PCM MINVAL_SGL -#define WAV_BITS 16 -//#define SAMPLE_BITS 16 -#define SAMPLE_BITS 32 -#define SAMPLE_MAX ((INT_PCM)(((ULONG)1 << (SAMPLE_BITS - 1)) - 1)) -#define SAMPLE_MIN (~SAMPLE_MAX) -#endif - -// foobar_pd: +/* kode54 - changes to allow decoding fixed point directly */ typedef LONG INT_PCM; #define MAXVAL_PCM MAXVAL_DBL #define MINVAL_PCM MINVAL_DBL #define WAV_BITS 32 -//#define SAMPLE_BITS 16 #define SAMPLE_BITS 32 #define SAMPLE_MAX ((INT_PCM)(((ULONG)1 << (SAMPLE_BITS - 1)) - 1)) #define SAMPLE_MIN (~SAMPLE_MAX) diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib b/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib index dbf08e368..4ca2b72a1 100755 Binary files a/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib and b/ThirdParty/fdk-aac/lib/libfdk-aac.2.dylib differ diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.a b/ThirdParty/fdk-aac/lib/libfdk-aac.a index a4c86e170..a3621dcbe 100644 Binary files a/ThirdParty/fdk-aac/lib/libfdk-aac.a and b/ThirdParty/fdk-aac/lib/libfdk-aac.a differ diff --git a/ThirdParty/fdk-aac/lib/libfdk-aac.la b/ThirdParty/fdk-aac/lib/libfdk-aac.la index a3191a4d0..fd76cea61 100755 --- a/ThirdParty/fdk-aac/lib/libfdk-aac.la +++ b/ThirdParty/fdk-aac/lib/libfdk-aac.la @@ -38,4 +38,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/usr/local/lib' +libdir='/Users/chris/Source/Repos/cog/ThirdParty/fdk-aac/lib'