[FFmpeg-cvslog] Merge commit '8c816c0c9b12fdefd9046415e97df299880bc9b8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Nov 17 15:06:10 2016 +0100| [90b72f6bdac98bbdd4bfddbfdc6038c667d7d30e] | committer: Hendrik Leppkes

Merge commit '8c816c0c9b12fdefd9046415e97df299880bc9b8'

* commit '8c816c0c9b12fdefd9046415e97df299880bc9b8':
  checkasm/arm: align the clobber check data properly for ldrd

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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

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

diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S
index 3e3806b..1069adc 100644
--- a/tests/checkasm/arm/checkasm.S
+++ b/tests/checkasm/arm/checkasm.S
@@ -22,7 +22,7 @@
 
 #include "libavutil/arm/asm.S"
 
-const register_init
+const register_init, align=3
     .quad 0x21f86d66c8ca00ce
     .quad 0x75b6ba21077c48ad
     .quad 0xed56bb2dcb3c7736


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