diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:36:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:36:56 +0100 |
| commit | edba54630b6f6157802a167d04d4da4c33f52d72 (patch) | |
| tree | 7a8ad554a75e4a93397412c715c34d2b2f53e082 /libavcodec/arm/hpeldsp_arm.S | |
| parent | 3c00d4c5f0ae855981a0cf8addfae0c948414625 (diff) | |
| parent | 5dae4872357613a0b51120b54a4c5221e0ec3f69 (diff) | |
| download | ffmpeg-edba54630b6f6157802a167d04d4da4c33f52d72.tar.gz | |
Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
arm: Allow overriding the alignment set in the function macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/hpeldsp_arm.S')
| -rw-r--r-- | libavcodec/arm/hpeldsp_arm.S | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/libavcodec/arm/hpeldsp_arm.S b/libavcodec/arm/hpeldsp_arm.S index 2f3d3114ea..429c3ea020 100644 --- a/libavcodec/arm/hpeldsp_arm.S +++ b/libavcodec/arm/hpeldsp_arm.S @@ -89,8 +89,7 @@ .endm @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels16_arm, export=1 +function ff_put_pixels16_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -141,8 +140,7 @@ function ff_put_pixels16_arm, export=1 endfunc @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels8_arm, export=1 +function ff_put_pixels8_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -193,8 +191,7 @@ function ff_put_pixels8_arm, export=1 endfunc @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels8_x2_arm, export=1 +function ff_put_pixels8_x2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -252,8 +249,7 @@ function ff_put_pixels8_x2_arm, export=1 pop {r4-r10,pc} endfunc - .align 5 -function ff_put_no_rnd_pixels8_x2_arm, export=1 +function ff_put_no_rnd_pixels8_x2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -313,8 +309,7 @@ endfunc @ ---------------------------------------------------------------- - .align 5 -function ff_put_pixels8_y2_arm, export=1 +function ff_put_pixels8_y2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -411,8 +406,7 @@ function ff_put_pixels8_y2_arm, export=1 pop {r4-r11,pc} endfunc - .align 5 -function ff_put_no_rnd_pixels8_y2_arm, export=1 +function ff_put_no_rnd_pixels8_y2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -578,8 +572,7 @@ endfunc pop {r4-r11,pc} .endm - .align 5 -function ff_put_pixels8_xy2_arm, export=1 +function ff_put_pixels8_xy2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] @@ -594,8 +587,7 @@ function ff_put_pixels8_xy2_arm, export=1 4: RND_XY2_EXPAND 3, lsl endfunc - .align 5 -function ff_put_no_rnd_pixels8_xy2_arm, export=1 +function ff_put_no_rnd_pixels8_xy2_arm, export=1, align=5 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned pld [r1] |