diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-02-07 09:20:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-07 15:15:19 +0100 |
| commit | 691b7f5e9e29698841c6bf1654605760020c0e8e (patch) | |
| tree | ed7b455bf060b1562f7d471ab90d3cf1d6bb69cf /libavcodec/x86 | |
| parent | 46e2afa4dcb5ed6b4a6aa7aacbce2df74ed09c03 (diff) | |
lavc/lossless_audiodsp: revert various commits
Their intent was to make the DSP work with wmalossless pro.
The later was fixed to work with the DSP.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/lossless_audiodsp_init.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/libavcodec/x86/lossless_audiodsp_init.c b/libavcodec/x86/lossless_audiodsp_init.c index da1e9e8efc..197173caf4 100644 --- a/libavcodec/x86/lossless_audiodsp_init.c +++ b/libavcodec/x86/lossless_audiodsp_init.c @@ -31,28 +31,6 @@ 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 (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); -} - -static int32_t scalarproduct_and_madd_int16_ssse3(int16_t *v1, const int16_t *v2, - const int16_t *v3, - int order, int mul) -{ - 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 - av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) { #if HAVE_YASM @@ -62,10 +40,10 @@ av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_mmxext; if (EXTERNAL_SSE2(cpu_flags)) - c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_sse2; + c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2; 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; + c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_ssse3; #endif } |