diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 01:48:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 02:02:25 +0200 |
| commit | fc6903337188a8f09aae24471d2c1e0eeaf396c0 (patch) | |
| tree | 09101b480a5201cf02215d2c0c9e5e97ebf4b400 | |
| parent | dfdee6cab323edf2a47ddba800f2b117b4d20fef (diff) | |
| download | ffmpeg-streaming-fc6903337188a8f09aae24471d2c1e0eeaf396c0.zip ffmpeg-streaming-fc6903337188a8f09aae24471d2c1e0eeaf396c0.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/sbrdsp.asm | 4 | ||||
| -rw-r--r-- | libavcodec/x86/sbrdsp_init.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/x86/sbrdsp.asm b/libavcodec/x86/sbrdsp.asm index 8669691..1ce5777 100644 --- a/libavcodec/x86/sbrdsp.asm +++ b/libavcodec/x86/sbrdsp.asm @@ -321,6 +321,8 @@ cglobal sbr_qmf_pre_shuffle, 1,4,7,z movq [r2q], m2 REP_RET +%if WIN64 == 0 + %if WIN64 %define NREGS 0 %define NOISE_TABLE sbr_noise_table @@ -428,3 +430,5 @@ apply_noise_main: add count, mmsize jl .loop RET + +%endif ; WIN64 == 0 diff --git a/libavcodec/x86/sbrdsp_init.c b/libavcodec/x86/sbrdsp_init.c index cc88fca..4eff496 100644 --- a/libavcodec/x86/sbrdsp_init.c +++ b/libavcodec/x86/sbrdsp_init.c @@ -68,7 +68,7 @@ av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s) if (EXTERNAL_SSE2(mm_flags)) { s->qmf_deint_bfly = ff_sbr_qmf_deint_bfly_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[1] = ff_sbr_hf_apply_noise_1_sse2; s->hf_apply_noise[2] = ff_sbr_hf_apply_noise_2_sse2; |
