[FFmpeg-devel] [PATCH] Fix compilation with nasm.

[Ronald S. Bultje]

From: "Ronald S. Bultje" <rsbultje at gmail.com>

---
 libavcodec/x86/fft.asm              | 3 +--
 libavcodec/x86/vp9dsp.asm           | 6 +++---
 libswresample/x86/audio_convert.asm | 3 +--
 libswresample/x86/rematrix.asm      | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm
index 5071741..45ca892 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/libavcodec/x86/vp9dsp.asm b/libavcodec/x86/vp9dsp.asm
index 740d67c..f81ac72 100644
--- a/libavcodec/x86/vp9dsp.asm
+++ b/libavcodec/x86/vp9dsp.asm
@@ -87,7 +87,7 @@ SECTION .text
 
 %macro filter_h_fn 1
 %assign %%px mmsize/2
-cglobal %1_8tap_1d_h_%%px, 6, 6, 11, dst, dstride, src, sstride, h, filtery
+cglobal %1_8tap_1d_h_ %+ %%px, 6, 6, 11, dst, dstride, src, sstride, h, filtery
     mova        m6, [pw_256]
     mova        m7, [filteryq+ 0]
 %if ARCH_X86_64 && mmsize > 8
@@ -148,9 +148,9 @@ filter_h_fn avg
 %macro filter_v_fn 1
 %assign %%px mmsize/2
 %if ARCH_X86_64
-cglobal %1_8tap_1d_v_%%px, 6, 8, 11, dst, dstride, src, sstride, h, filtery, src4, sstride3
+cglobal %1_8tap_1d_v_ %+ %%px, 6, 8, 11, dst, dstride, src, sstride, h, filtery, src4, sstride3
 %else
-cglobal %1_8tap_1d_v_%%px, 4, 7, 11, dst, dstride, src, sstride, filtery, src4, sstride3
+cglobal %1_8tap_1d_v_ %+ %%px, 4, 7, 11, dst, dstride, src, sstride, filtery, src4, sstride3
     mov   filteryq, r5mp
 %define hd r4mp
 %endif
diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index 4963959..b6e9e5d 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 84448e8..f0ae959 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
 
-- 
1.7.11.3