diff options
| author | Martin Storsjö <martin@martin.st> | 2013-01-17 18:58:25 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-01-17 19:07:35 +0200 |
| commit | 973b4d44f1e87df63d78b864eeb5988119f822e7 (patch) | |
| tree | 9d1d6b6f287e55d3cc6279050a655be78e38cc16 | |
| parent | e33db35b4a91ad543d9dde3a981a89118ba68937 (diff) | |
| download | ffmpeg-973b4d44f1e87df63d78b864eeb5988119f822e7.tar.gz | |
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
This fixes builds on 64bit MSVC.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavutil/x86/float_dsp_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |