diff options
author | James Almer <jamrial@gmail.com> | 2015-02-06 03:46:43 -0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 20:04:09 +0100 |
commit | ee902d3d2d78b1aed7d1c562d58128b450a54b02 (patch) | |
tree | 494b1c89168a482769ffeb67ef5554a31128b8b7 /libavcodec | |
parent | 9bc62da980336ad01495efbcae248aacdd0b831e (diff) | |
download | ffmpeg-ee902d3d2d78b1aed7d1c562d58128b450a54b02.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>
(cherry picked from commit 383fddeec65f4cebcb197eae702dfefdc6192eb0)
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-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 } |