diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-19 09:56:01 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-19 09:56:01 +0200 |
| commit | b38910c9790253b362839042a17e13252c1d4b90 (patch) | |
| tree | e0914971cbc660f5bf96de7f4a77b7d5db7f4111 /libavcodec/x86/mpegaudiodsp.c | |
| parent | 72c93abaad708c013fd407a0c2e8288ebd9285d1 (diff) | |
| download | ffmpeg-b38910c9790253b362839042a17e13252c1d4b90.tar.gz | |
Fix compilation with !HAVE_6REGS.
Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
Diffstat (limited to 'libavcodec/x86/mpegaudiodsp.c')
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 5dc7bc6362..2edf157d6f 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_SSE2_INLINE +#if HAVE_6REGS && HAVE_SSE2_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_SSE2_INLINE */ +#endif /* HAVE_6REGS && HAVE_SSE2_INLINE */ #if HAVE_YASM #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ @@ -255,7 +255,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) } } -#if HAVE_SSE2_INLINE +#if HAVE_6REGS && HAVE_SSE2_INLINE if (INLINE_SSE2(cpu_flags)) { s->apply_window_float = apply_window_mp3; } |