diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-01-23 17:45:58 +0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-01-27 10:19:57 +0800 |
| commit | 3b15a6d742edd368696a1feb6fa99892768e8a73 (patch) | |
| tree | 0ba73cc23175f3fb0e99cb842b8c2119c9cdf352 /libswscale/x86/scale.asm | |
| parent | 08628b6afbc9b708b46f871f25a7a6be76ba4337 (diff) | |
| download | ffmpeg-3b15a6d742edd368696a1feb6fa99892768e8a73.tar.gz | |
config.asm: change %ifdef directives to %if directives.
This allows combining multiple conditionals in a single statement.
Diffstat (limited to 'libswscale/x86/scale.asm')
| -rw-r--r-- | libswscale/x86/scale.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index d35589419c..0d367f7a14 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -51,7 +51,7 @@ SECTION .text ; SCALE_FUNC source_width, intermediate_nbits, filtersize, filtersuffix, opt, n_args, n_xmm %macro SCALE_FUNC 7 cglobal hscale%1to%2_%4_%5, %6, 7, %7 -%ifdef ARCH_X86_64 +%if ARCH_X86_64 movsxd r2, r2d %endif ; x86-64 %if %2 == 19 @@ -237,7 +237,7 @@ cglobal hscale%1to%2_%4_%5, %6, 7, %7 %else ; %4 == X || %4 == X8 %define r6sub 0 %endif ; %4 ==/!= X4 -%ifdef ARCH_X86_64 +%if ARCH_X86_64 push r12 movsxd r6, r6d ; filterSize lea r12, [r3+(r6-r6sub)*srcmul] ; &src[filterSize&~4] @@ -384,7 +384,7 @@ cglobal hscale%1to%2_%4_%5, %6, 7, %7 %ifnidn %3, X REP_RET %else ; %3 == X -%ifdef ARCH_X86_64 +%if ARCH_X86_64 pop r12 RET %else ; x86-32 @@ -419,7 +419,7 @@ SCALE_FUNCS 10, 19, %1, %3 SCALE_FUNCS 16, 19, %1, %4 %endmacro -%ifdef ARCH_X86_32 +%if ARCH_X86_32 INIT_MMX SCALE_FUNCS2 mmx, 0, 0, 0 %endif |