summaryrefslogtreecommitdiff
path: root/libavcodec/x86/vp56dsp_init.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2010-08-25 13:44:16 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-08-25 13:44:16 +0000
commit89fa3504edbaaacd44eb2c510baca283d1dbbf7b (patch)
treec6be26622e05bf18d153ce964f9048a3fc4f5910 /libavcodec/x86/vp56dsp_init.c
parent3a0885146c61d6eff4da4006f6459e720fcf5ccd (diff)
Move vp6_filter_diag4() x86 SIMD code from inline ASM to YASM. This should
help in fixing the Win64 fate failures. Originally committed as revision 24922 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/vp56dsp_init.c')
-rw-r--r--libavcodec/x86/vp56dsp_init.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp56dsp_init.c
index 8b2eb68594..5120ed231d 100644
--- a/libavcodec/x86/vp56dsp_init.c
+++ b/libavcodec/x86/vp56dsp_init.c
@@ -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 @@ av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum CodecID codec)
c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2;
}
}
+#endif
}