RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-04-24 01:48:16 +02:00
parent dfdee6cab3
commit fc69033371
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/x86/sbrdsp.asm
View File

@ -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

2
libavcodec/x86/sbrdsp_init.c
View File

@ -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;