From 973b4d44f1e87df63d78b864eeb5988119f822e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 17 Jan 2013 18:58:25 +0200 Subject: float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes builds on 64bit MSVC. Signed-off-by: Martin Storsjö --- libavutil/x86/float_dsp_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavutil') diff --git a/libavutil/x86/float_dsp_init.c b/libavutil/x86/float_dsp_init.c index 56fb32b0d5..1c678cb40c 100644 --- a/libavutil/x86/float_dsp_init.c +++ b/libavutil/x86/float_dsp_init.c @@ -41,7 +41,7 @@ extern void ff_vector_dmul_scalar_sse2(double *dst, const double *src, extern void ff_vector_dmul_scalar_avx(double *dst, const double *src, double mul, int len); -#if HAVE_6REGS +#if HAVE_6REGS && HAVE_INLINE_ASM static void vector_fmul_window_3dnowext(float *dst, const float *src0, const float *src1, const float *win, int len) @@ -105,13 +105,13 @@ static void vector_fmul_window_sse(float *dst, const float *src0, : "r"(dst + len), "r"(src0 + len), "r"(src1), "r"(win + len) ); } -#endif /* HAVE_6REGS */ +#endif /* HAVE_6REGS && HAVE_INLINE_ASM */ void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp) { int mm_flags = av_get_cpu_flags(); -#if HAVE_6REGS +#if HAVE_6REGS && HAVE_INLINE_ASM if (INLINE_AMD3DNOWEXT(mm_flags)) { fdsp->vector_fmul_window = vector_fmul_window_3dnowext; } -- cgit v1.2.3