diff options
| author | James Almer <jamrial@gmail.com> | 2015-02-06 03:46:43 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-02-06 17:30:17 -0300 |
| commit | 383fddeec65f4cebcb197eae702dfefdc6192eb0 (patch) | |
| tree | 29349d126d3c300258bcd539894fbeac2c3325cf /libavcodec/x86 | |
| parent | 510b39c2137b79829294361c1ffece06e89e5fa6 (diff) | |
| download | ffmpeg-383fddeec65f4cebcb197eae702dfefdc6192eb0.tar.gz | |
x86/lossless_audiodsp: fix compilation with --disable-yasm
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/lossless_audiodsp_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/lossless_audiodsp_init.c b/libavcodec/x86/lossless_audiodsp_init.c index 2c13e1e31c..da1e9e8efc 100644 --- a/libavcodec/x86/lossless_audiodsp_init.c +++ b/libavcodec/x86/lossless_audiodsp_init.c @@ -31,32 +31,31 @@ int32_t ff_scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul); +#if HAVE_YASM static int32_t scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul) { -#if HAVE_SSE2_EXTERNAL if (order & 8) return ff_scalarproduct_and_madd_int16_mmxext(v1, v2, v3, order, mul); else return ff_scalarproduct_and_madd_int16_sse2(v1, v2, v3, order, mul); -#endif } static int32_t scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul) { -#if HAVE_SSSE3_EXTERNAL if (order & 8) return ff_scalarproduct_and_madd_int16_mmxext(v1, v2, v3, order, mul); else return ff_scalarproduct_and_madd_int16_ssse3(v1, v2, v3, order, mul); -#endif } +#endif av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) { +#if HAVE_YASM int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_MMXEXT(cpu_flags)) @@ -68,4 +67,5 @@ av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) if (EXTERNAL_SSSE3(cpu_flags) && !(cpu_flags & (AV_CPU_FLAG_SSE42 | AV_CPU_FLAG_3DNOW))) // cachesplit c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_ssse3; +#endif } |