[FFmpeg-cvslog] ARM: 4-byte align start of all asm functions

Mans Rullgard git at videolan.org
Sat Jan 14 02:53:46 CET 2012

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Fri Jan 13 18:56:36 2012 +0000| [5c5e1ea3cdccc5af0b2d3de15a9c3739c30ec88c] | committer: Mans Rullgard

ARM: 4-byte align start of all asm functions

Due to apprent bugs in the GNU assembler and/or linker, relocations
can be incorrectly processed if the alignment of a Thumb instruction
is changed in the output file compared to the input object.

This fixes crashes in h264 decoding with Thumb enabled. No effect in
ARM mode since everything is 4-byte aligned there.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c5e1ea3cdccc5af0b2d3de15a9c3739c30ec88c

 libavcodec/arm/asm.S |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index aaf497e..3b495a2 100644
--- a/libavcodec/arm/asm.S
+++ b/libavcodec/arm/asm.S
@@ -68,6 +68,7 @@ ELF     .size   \name, . - \name
         .purgem endfunc
+        .align          2
     .if \export
         .global EXTERN_ASM\name

More information about the ffmpeg-cvslog mailing list