From bde73f28afe05054169eded9bb07e15466d1f4da Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 25 Jul 2012 20:32:58 -0700 Subject: [PATCH] mpegaudio: bury inline asm under HAVE_INLINE_ASM. --- libavcodec/x86/mpegaudiodec_mmx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/x86/mpegaudiodec_mmx.c b/libavcodec/x86/mpegaudiodec_mmx.c index f51a06d14c..88a347796c 100644 --- a/libavcodec/x86/mpegaudiodec_mmx.c +++ b/libavcodec/x86/mpegaudiodec_mmx.c @@ -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]; +#if HAVE_INLINE_ASM + #define MACS(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; } +#endif /* HAVE_INLINE_ASM */ #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ 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) { s->apply_window_float = apply_window_mp3; } +#endif /* HAVE_INLINE_ASM */ #if HAVE_YASM if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) { s->imdct36_blocks_float = imdct36_blocks_avx;