From 3b15a6d742edd368696a1feb6fa99892768e8a73 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 23 Jan 2012 17:45:58 +0800 Subject: config.asm: change %ifdef directives to %if directives. This allows combining multiple conditionals in a single statement. --- libswscale/x86/input.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libswscale/x86/input.asm') diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index a23cf05301..e6dde7c875 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -64,7 +64,7 @@ SECTION .text ; split the loop in an aligned and unaligned case %macro YUYV_TO_Y_FN 2-3 cglobal %2ToY, 3, 3, %1, dst, src, w -%ifdef ARCH_X86_64 +%if ARCH_X86_64 movsxd wq, wd %endif add dstq, wq @@ -134,7 +134,7 @@ cglobal %2ToY, 3, 3, %1, dst, src, w ; split the loop in an aligned and unaligned case %macro YUYV_TO_UV_FN 2-3 cglobal %2ToUV, 3, 4, %1, dstU, dstV, src, w -%ifdef ARCH_X86_64 +%if ARCH_X86_64 movsxd wq, dword r4m %else ; x86-32 mov wq, r4m @@ -189,7 +189,7 @@ cglobal %2ToUV, 3, 4, %1, dstU, dstV, src, w ; %2 = nv12 or nv21 %macro NVXX_TO_UV_FN 2 cglobal %2ToUV, 3, 4, %1, dstU, dstV, src, w -%ifdef ARCH_X86_64 +%if ARCH_X86_64 movsxd wq, dword r4m %else ; x86-32 mov wq, r4m @@ -215,7 +215,7 @@ cglobal %2ToUV, 3, 4, %1, dstU, dstV, src, w %endif ; mmsize == 8/16 %endmacro -%ifdef ARCH_X86_32 +%if ARCH_X86_32 INIT_MMX mmx YUYV_TO_Y_FN 0, yuyv YUYV_TO_Y_FN 0, uyvy -- cgit v1.2.3