| @@ -36,6 +36,8 @@ void ff_four_imdct36_float_avx(float *out, float *buf, float *in, float *win, | |||||
| DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40]; | DECLARE_ALIGNED(16, static float, mdct_win_sse)[2][4][4*40]; | ||||
| #if HAVE_INLINE_ASM | |||||
| #define MACS(rt, ra, rb) rt+=(ra)*(rb) | #define MACS(rt, ra, rb) rt+=(ra)*(rb) | ||||
| #define MLSS(rt, ra, rb) rt-=(ra)*(rb) | #define MLSS(rt, ra, rb) rt-=(ra)*(rb) | ||||
| @@ -178,6 +180,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out, | |||||
| *out = sum; | *out = sum; | ||||
| } | } | ||||
| #endif /* HAVE_INLINE_ASM */ | |||||
| #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ | #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ | ||||
| static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \ | static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \ | ||||
| @@ -235,9 +238,11 @@ void ff_mpadsp_init_mmx(MPADSPContext *s) | |||||
| } | } | ||||
| } | } | ||||
| #if HAVE_INLINE_ASM | |||||
| if (mm_flags & AV_CPU_FLAG_SSE2) { | if (mm_flags & AV_CPU_FLAG_SSE2) { | ||||
| s->apply_window_float = apply_window_mp3; | s->apply_window_float = apply_window_mp3; | ||||
| } | } | ||||
| #endif /* HAVE_INLINE_ASM */ | |||||
| #if HAVE_YASM | #if HAVE_YASM | ||||
| if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) { | if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) { | ||||
| s->imdct36_blocks_float = imdct36_blocks_avx; | s->imdct36_blocks_float = imdct36_blocks_avx; | ||||