From: James Almer Date: Thu, 12 Oct 2017 16:48:08 +0000 (-0300) Subject: Merge commit '6eef263aca281fb582e1fa3d841ac20ef747a252' X-Git-Tag: n4.1-dev~2288 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/b78bb51a7cdd85ecb88e00fd96276071c092e8f9 Merge commit '6eef263aca281fb582e1fa3d841ac20ef747a252' * commit '6eef263aca281fb582e1fa3d841ac20ef747a252': x86: Merge align directives into SECTION_RODATA declarations where possible Merged-by: James Almer --- b78bb51a7cdd85ecb88e00fd96276071c092e8f9 diff --cc libavcodec/x86/imdct36.asm index 960eabd,ddb7174..b386ab9 --- 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 d0c3af0,4949842..bcad1ae --- 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