Commit fc690333 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC, Try #2

    This should fix building with MSVC until someone can change the
    code so it works with MSVC
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent dfdee6ca
...@@ -321,6 +321,8 @@ cglobal sbr_qmf_pre_shuffle, 1,4,7,z ...@@ -321,6 +321,8 @@ cglobal sbr_qmf_pre_shuffle, 1,4,7,z
movq [r2q], m2 movq [r2q], m2
REP_RET REP_RET
%if WIN64 == 0
%if WIN64 %if WIN64
%define NREGS 0 %define NREGS 0
%define NOISE_TABLE sbr_noise_table %define NOISE_TABLE sbr_noise_table
...@@ -428,3 +430,5 @@ apply_noise_main: ...@@ -428,3 +430,5 @@ apply_noise_main:
add count, mmsize add count, mmsize
jl .loop jl .loop
RET RET
%endif ; WIN64 == 0
...@@ -68,7 +68,7 @@ av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s) ...@@ -68,7 +68,7 @@ av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s)
if (EXTERNAL_SSE2(mm_flags)) { if (EXTERNAL_SSE2(mm_flags)) {
s->qmf_deint_bfly = ff_sbr_qmf_deint_bfly_sse2; s->qmf_deint_bfly = ff_sbr_qmf_deint_bfly_sse2;
s->qmf_pre_shuffle = ff_sbr_qmf_pre_shuffle_sse2; s->qmf_pre_shuffle = ff_sbr_qmf_pre_shuffle_sse2;
#if ARCH_X86_32 || !defined(_MSC_VER) #if ARCH_X86_32 || !defined(_WIN32)
s->hf_apply_noise[0] = ff_sbr_hf_apply_noise_0_sse2; s->hf_apply_noise[0] = ff_sbr_hf_apply_noise_0_sse2;
s->hf_apply_noise[1] = ff_sbr_hf_apply_noise_1_sse2; s->hf_apply_noise[1] = ff_sbr_hf_apply_noise_1_sse2;
s->hf_apply_noise[2] = ff_sbr_hf_apply_noise_2_sse2; s->hf_apply_noise[2] = ff_sbr_hf_apply_noise_2_sse2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment