generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86/lossless_audiodsp: fix compilation with --disable-yasm

Browse Source 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-02-06 03:46:43 -03:00
parent 510b39c213
commit 383fddeec6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/x86/lossless_audiodsp_init.c
View File

@ -31,32 +31,31 @@ int32_t ff_scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2,
const int16_t *v3, const int16_t *v3,
int order, int mul); int order, int mul);
#if HAVE_YASM
static int32_t scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2, static int32_t scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2,
const int16_t *v3, const int16_t *v3,
int order, int mul) int order, int mul)
{ {
#if HAVE_SSE2_EXTERNAL
if (order & 8) if (order & 8)
return ff_scalarproduct_and_madd_int16_mmxext(v1, v2, v3, order, mul); return ff_scalarproduct_and_madd_int16_mmxext(v1, v2, v3, order, mul);
else else
return ff_scalarproduct_and_madd_int16_sse2(v1, v2, v3, order, mul); 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, static int32_t scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2,
const int16_t *v3, const int16_t *v3,
int order, int mul) int order, int mul)
{ {
#if HAVE_SSSE3_EXTERNAL
if (order & 8) if (order & 8)
return ff_scalarproduct_and_madd_int16_mmxext(v1, v2, v3, order, mul); return ff_scalarproduct_and_madd_int16_mmxext(v1, v2, v3, order, mul);
else else
return ff_scalarproduct_and_madd_int16_ssse3(v1, v2, v3, order, mul); return ff_scalarproduct_and_madd_int16_ssse3(v1, v2, v3, order, mul);
#endif
} }
#endif
av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c)
{ {
#if HAVE_YASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMXEXT(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) && if (EXTERNAL_SSSE3(cpu_flags) &&
!(cpu_flags & (AV_CPU_FLAG_SSE42 | AV_CPU_FLAG_3DNOW))) // cachesplit !(cpu_flags & (AV_CPU_FLAG_SSE42 | AV_CPU_FLAG_3DNOW))) // cachesplit
c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_ssse3; c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_ssse3;
#endif
} }