From: X5-452 Subject: [PATCH] lame-3.99.1 Build for cross compile (w64) --- lame-3.99.orig/libmp3lame/vbrquantize.c +++ lame-3.99/libmp3lame/vbrquantize.c @@ -68,10 +68,6 @@ # if _MSC_VER < 1400 # define VOLATILE volatile # else -# define VOLATILE -# ifndef FORCEINLINE -# define FORCEINLINE __forceinline -# endif # endif #else # define VOLATILE @@ -77,10 +77,6 @@ # define VOLATILE #endif -#ifndef FORCEINLINE -#define FORCEINLINE -#endif - typedef VOLATILE union { float f; int i; @@ -119,7 +119,7 @@ static DOUBLEX const MAGIC_FLOAT = MAGIC_FLOAT_def; -FORCEINLINE static float +static float vec_max_c(const float * xr34, unsigned int bw) { float xfsf = 0; @@ -150,7 +150,7 @@ return xfsf; } -FORCEINLINE static float +static float vec_sum_sq_c(const float * xr, unsigned int bw) { float sum = 0.0f; @@ -173,7 +173,7 @@ } -FORCEINLINE static uint8_t +static uint8_t find_lowest_scalefac(const FLOAT xr34) { uint8_t sf_ok = 255; @@ -195,7 +195,7 @@ } -FORCEINLINE static int +static int below_noise_floor(FLOAT sum, FLOAT l3xmin) { FLOAT const d = -1E-20; @@ -203,7 +203,7 @@ } -FORCEINLINE static void +static void k_34_4(DOUBLEX x[4], int l3[4]) { #ifdef TAKEHIRO_IEEE754_HACK