[FFmpeg-cvslog] Merge commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 21:03:50 2017 -0300| [122a749dfcaa550eb9c1bf63748f12d011f93398] | committer: James Almer

Merge commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf'

* commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf':
  checkasm: aarch64: Specify alignment for the register_init const array

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=122a749dfcaa550eb9c1bf63748f12d011f93398
---

 tests/checkasm/aarch64/checkasm.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checkasm/aarch64/checkasm.S b/tests/checkasm/aarch64/checkasm.S
index 75a9a56143..89f2b77548 100644
--- a/tests/checkasm/aarch64/checkasm.S
+++ b/tests/checkasm/aarch64/checkasm.S
@@ -22,7 +22,7 @@
 
 #include "libavutil/aarch64/asm.S"
 
-const register_init
+const register_init, align=4
     .quad 0x21f86d66c8ca00ce
     .quad 0x75b6ba21077c48ad
     .quad 0xed56bb2dcb3c7736


======================================================================