Signed-off-by: James Almer <[email protected]>
---
See
http://fate.ffmpeg.org/log.cgi?time=20150206062639&log=compile&slot=x86_64-darwin-gcc-4.6
libavcodec/x86/lossless_audiodsp_init.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/x86/lossless_audiodsp_init.c
b/libavcodec/x86/lossless_audiodsp_init.c
index 2c13e1e..da1e9e8 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
}
--
2.2.2
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
