ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 12 13:48:08 2017 -0300| [b78bb51a7cdd85ecb88e00fd96276071c092e8f9] | committer: James Almer
Merge commit '6eef263aca281fb582e1fa3d841ac20ef747a252'
* commit '6eef263aca281fb582e1fa3d841ac20ef747a252':
x86: Merge align directives into SECTION_RODATA declarations where possible
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b78bb51a7cdd85ecb88e00fd96276071c092e8f9
---
libavcodec/x86/dct32.asm | 6 ++----
libavcodec/x86/imdct36.asm | 1 -
libavcodec/x86/rv40dsp.asm | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm
index 4e657b5460..21e2f21c97 100644
--- a/libavcodec/x86/dct32.asm
+++ b/libavcodec/x86/dct32.asm
@@ -23,7 +23,8 @@
SECTION_RODATA 32
-align 32
+ps_p1p1m1m1: dd 0, 0, 0x80000000, 0x80000000, 0, 0, 0x80000000, 0x80000000
+
ps_cos_vec: dd 0.500603, 0.505471, 0.515447, 0.531043
dd 0.553104, 0.582935, 0.622504, 0.674808
dd -10.190008, -3.407609, -2.057781, -1.484165
@@ -38,9 +39,6 @@ ps_cos_vec: dd 0.500603, 0.505471, 0.515447, 0.531043
dd 1.000000, 0.707107, 1.000000, -0.707107
dd 0.707107, 0.707107, 0.707107, 0.707107
-align 32
-ps_p1p1m1m1: dd 0, 0, 0x80000000, 0x80000000, 0, 0, 0x80000000, 0x80000000
-
%macro BUTTERFLY 4
subps %4, %1, %2
addps %2, %2, %1
diff --git a/libavcodec/x86/imdct36.asm b/libavcodec/x86/imdct36.asm
index 960eabdda5..b386ab95fc 100644
--- a/libavcodec/x86/imdct36.asm
+++ b/libavcodec/x86/imdct36.asm
@@ -23,7 +23,6 @@
SECTION_RODATA
-align 16
ps_mask: dd 0, ~0, ~0, ~0
ps_mask2: dd 0, ~0, 0, ~0
ps_mask3: dd 0, 0, 0, ~0
diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm
index d0c3af0f8d..bcad1aee80 100644
--- a/libavcodec/x86/rv40dsp.asm
+++ b/libavcodec/x86/rv40dsp.asm
@@ -25,7 +25,6 @@
SECTION_RODATA
-align 16
pw_1024: times 8 dw 1 << (16 - 6) ; pw_1024
sixtap_filter_hb_m: times 8 db 1, -5
======================================================================
diff --cc libavcodec/x86/imdct36.asm
index 960eabdda5,ddb71749a5..b386ab95fc
--- a/libavcodec/x86/imdct36.asm
+++ b/libavcodec/x86/imdct36.asm
@@@ -21,9 -21,8 +21,8 @@@
%include "libavutil/x86/x86util.asm"
-SECTION_RODATA 16
+SECTION_RODATA
- align 16
ps_mask: dd 0, ~0, ~0, ~0
ps_mask2: dd 0, ~0, 0, ~0
ps_mask3: dd 0, 0, 0, ~0
diff --cc libavcodec/x86/rv40dsp.asm
index d0c3af0f8d,4949842e8f..bcad1aee80
--- a/libavcodec/x86/rv40dsp.asm
+++ b/libavcodec/x86/rv40dsp.asm
@@@ -23,9 -23,8 +23,8 @@@
%include "libavutil/x86/x86util.asm"
-SECTION_RODATA 16
+SECTION_RODATA
- align 16
pw_1024: times 8 dw 1 << (16 - 6) ; pw_1024
sixtap_filter_hb_m: times 8 db 1, -5