aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/dsputil_arm.S
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-01-07 12:13:11 +0200
committerMartin Storsjö <martin@martin.st>2014-01-07 19:29:56 +0200
commit5dae4872357613a0b51120b54a4c5221e0ec3f69 (patch)
treeb8c2f1ff1362289dd8ee16722f25b9195beb6db3 /libavcodec/arm/dsputil_arm.S
parentb7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0 (diff)
downloadffmpeg-5dae4872357613a0b51120b54a4c5221e0ec3f69.tar.gz
arm: Allow overriding the alignment set in the function macro
The function macro always sets .align 2 before declaring the function label (since 5c5e1ea3) and always sets the section to .text (since 278caa6a). The .align 5 before certain functions, added in fc252eba, were added before .text and .align were added to the function macro and thus became useless/unused when the function macro got them. This restores the original intention, to align the loop entry points. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/arm/dsputil_arm.S')
-rw-r--r--libavcodec/arm/dsputil_arm.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S
index f0029aee14..82fcf2ae91 100644
--- a/libavcodec/arm/dsputil_arm.S
+++ b/libavcodec/arm/dsputil_arm.S
@@ -22,9 +22,8 @@
#include "config.h"
#include "libavutil/arm/asm.S"
- .align 5
@ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride)
-function ff_add_pixels_clamped_arm, export=1
+function ff_add_pixels_clamped_arm, export=1, align=5
push {r4-r10}
mov r10, #8
1: