diff options
| author | James Almer <jamrial@gmail.com> | 2014-04-24 17:32:04 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-25 00:38:01 +0200 |
| commit | 5ac10d40fb9b65e476d1d591a892e0ff51cda6d5 (patch) | |
| tree | 11338d846db3b85177c8d068b3d74b63115633c8 /libavcodec/x86/mpegaudiodsp.c | |
| parent | d66de5006bbcfc8dd875b9385ec3552d1f9fcd6b (diff) | |
x86/mpegaudiodsp: define apply_window_mp3 as SSE
None of the handwritten asm in this function seems to be SSE2
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mpegaudiodsp.c')
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 2edf157d6f..163f84bda3 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -45,7 +45,7 @@ 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]; -#if HAVE_6REGS && HAVE_SSE2_INLINE +#if HAVE_6REGS && HAVE_SSE_INLINE #define MACS(rt, ra, rb) rt+=(ra)*(rb) #define MLSS(rt, ra, rb) rt-=(ra)*(rb) @@ -189,7 +189,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out, *out = sum; } -#endif /* HAVE_6REGS && HAVE_SSE2_INLINE */ +#endif /* HAVE_6REGS && HAVE_SSE_INLINE */ #if HAVE_YASM #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ @@ -255,11 +255,11 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) } } -#if HAVE_6REGS && HAVE_SSE2_INLINE - if (INLINE_SSE2(cpu_flags)) { +#if HAVE_6REGS && HAVE_SSE_INLINE + if (INLINE_SSE(cpu_flags)) { s->apply_window_float = apply_window_mp3; } -#endif /* HAVE_SSE2_INLINE */ +#endif /* HAVE_SSE_INLINE */ #if HAVE_YASM #if ARCH_X86_32 |