[FFmpeg-cvslog] float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window

Martin Storsjö git at videolan.org
Fri Jan 18 13:42:45 CET 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Jan 17 18:58:25 2013 +0200| [973b4d44f1e87df63d78b864eeb5988119f822e7] | committer: Martin Storsjö

float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window

This fixes builds on 64bit MSVC.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=973b4d44f1e87df63d78b864eeb5988119f822e7
---

 libavutil/x86/float_dsp_init.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/x86/float_dsp_init.c b/libavutil/x86/float_dsp_init.c
index 56fb32b..1c678cb 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;
     }



More information about the ffmpeg-cvslog mailing list