From ad75d2b590f0a4d2ea8b9748aa31ff98ba6fbf1e Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 7 Oct 2013 20:06:47 -0400 Subject: [PATCH] x86: Fix compilation with nasm on PPC & OS/2 Signed-off-by: Michael Niedermayer --- libavcodec/x86/fft.asm | 3 +-- libswresample/x86/audio_convert.asm | 3 +-- libswresample/x86/rematrix.asm | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm index 879b84e5fd..cae404c1a2 100644 --- a/libavcodec/x86/fft.asm +++ b/libavcodec/x86/fft.asm @@ -36,7 +36,7 @@ %define pointer resd %endif -SECTION_RODATA +SECTION_RODATA 32 struc FFTContext .nbits: resd 1 @@ -57,7 +57,6 @@ endstruc %define M_COS_PI_1_8 0.923879532511287 %define M_COS_PI_3_8 0.38268343236509 -align 32 ps_cos16_1: dd 1.0, M_COS_PI_1_8, M_SQRT1_2, M_COS_PI_3_8, 1.0, M_COS_PI_1_8, M_SQRT1_2, M_COS_PI_3_8 ps_cos16_2: dd 0, M_COS_PI_3_8, M_SQRT1_2, M_COS_PI_1_8, 0, -M_COS_PI_3_8, -M_SQRT1_2, -M_COS_PI_1_8 diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm index 4963959c54..b6e9e5d79d 100644 --- a/libswresample/x86/audio_convert.asm +++ b/libswresample/x86/audio_convert.asm @@ -20,8 +20,7 @@ %include "libavutil/x86/x86util.asm" -SECTION_RODATA -align 32 +SECTION_RODATA 32 flt2pm31: times 8 dd 4.6566129e-10 flt2p31 : times 8 dd 2147483648.0 flt2p15 : times 8 dd 32768.0 diff --git a/libswresample/x86/rematrix.asm b/libswresample/x86/rematrix.asm index 84448e8266..f0ae9599a2 100644 --- a/libswresample/x86/rematrix.asm +++ b/libswresample/x86/rematrix.asm @@ -21,8 +21,7 @@ %include "libavutil/x86/x86util.asm" -SECTION_RODATA -align 32 +SECTION_RODATA 32 dw1: times 8 dd 1 w1 : times 16 dw 1