diff x86/vp56dsp_init.c @ 12418:e17840120b80 libavcodec

Move vp6_filter_diag4() x86 SIMD code from inline ASM to YASM. This should help in fixing the Win64 fate failures.
author rbultje
date Wed, 25 Aug 2010 13:44:16 +0000
parents 9f06475db098
children a5ddb39627fd
line wrap: on
line diff
--- a/x86/vp56dsp_init.c	Wed Aug 25 13:42:28 2010 +0000
+++ b/x86/vp56dsp_init.c	Wed Aug 25 13:44:16 2010 +0000
@@ -23,11 +23,15 @@
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/vp56dsp.h"
-#include "vp6dsp_mmx.h"
-#include "vp6dsp_sse2.h"
+
+void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,
+                             const int16_t *h_weights,const int16_t *v_weights);
+void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride,
+                              const int16_t *h_weights,const int16_t *v_weights);
 
 av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum CodecID codec)
 {
+#if HAVE_YASM
     int mm_flags = mm_support();
 
     if (CONFIG_VP6_DECODER && codec == CODEC_ID_VP6) {
@@ -39,4 +43,5 @@
             c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2;
         }
     }
+#endif
 }