diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-01-27 16:34:10 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-01-27 16:34:10 +0000 |
| commit | ca6532f62051338d453ace5fdcb3139d96973271 (patch) | |
| tree | c9a6b8fe3fd40ef09391567b3590e8627e9586a8 | |
| parent | d8f9269dc645e0979b4de26888d8b5cec624219a (diff) | |
| download | ffmpeg-ca6532f62051338d453ace5fdcb3139d96973271.tar.gz | |
ARM: remove some unused macro arguments
Originally committed as revision 16824 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/arm/dsputil_arm_s.S | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/arm/dsputil_arm_s.S b/libavcodec/arm/dsputil_arm_s.S index a54983aae9..f10d6162f0 100644 --- a/libavcodec/arm/dsputil_arm_s.S +++ b/libavcodec/arm/dsputil_arm_s.S @@ -90,7 +90,7 @@ function ff_prefetch_arm, export=1 add \Rd1, \Rn1, \Rd1, lsr #1 .endm -.macro JMP_ALIGN tmp, reg, label1, label2, label3 +.macro JMP_ALIGN tmp, reg ands \tmp, \reg, #3 bic \reg, \reg, #3 beq 1f @@ -108,7 +108,7 @@ function put_pixels16_arm, export=1 @ block = word aligned, pixles = unaligned pld [r1] stmfd sp!, {r4-r11, lr} @ R14 is also called LR - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: ldmia r1, {r4-r7} add r1, r1, r2 @@ -160,7 +160,7 @@ function put_pixels8_arm, export=1 @ block = word aligned, pixles = unaligned pld [r1] stmfd sp!, {r4-r5,lr} @ R14 is also called LR - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: ldmia r1, {r4-r5} add r1, r1, r2 @@ -213,7 +213,7 @@ function put_pixels8_x2_arm, export=1 pld [r1] stmfd sp!, {r4-r10,lr} @ R14 is also called LR ldr r12, =0xfefefefe - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: ldmia r1, {r4-r5, r10} add r1, r1, r2 @@ -272,7 +272,7 @@ function put_no_rnd_pixels8_x2_arm, export=1 pld [r1] stmfd sp!, {r4-r10,lr} @ R14 is also called LR ldr r12, =0xfefefefe - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: ldmia r1, {r4-r5, r10} add r1, r1, r2 @@ -334,7 +334,7 @@ function put_pixels8_y2_arm, export=1 stmfd sp!, {r4-r11,lr} @ R14 is also called LR mov r3, r3, lsr #1 ldr r12, =0xfefefefe - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: ldmia r1, {r4-r5} add r1, r1, r2 @@ -432,7 +432,7 @@ function put_no_rnd_pixels8_y2_arm, export=1 stmfd sp!, {r4-r11,lr} @ R14 is also called LR mov r3, r3, lsr #1 ldr r12, =0xfefefefe - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: ldmia r1, {r4-r5} add r1, r1, r2 @@ -595,7 +595,7 @@ function put_pixels8_xy2_arm, export=1 @ block = word aligned, pixles = unaligned pld [r1] stmfd sp!, {r4-r11,lr} @ R14 is also called LR - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: RND_XY2_EXPAND 0, lsl @@ -618,7 +618,7 @@ function put_no_rnd_pixels8_xy2_arm, export=1 @ block = word aligned, pixles = unaligned pld [r1] stmfd sp!, {r4-r11,lr} @ R14 is also called LR - JMP_ALIGN r5, r1, 2f, 3f, 4f + JMP_ALIGN r5, r1 1: RND_XY2_EXPAND 0, lsr |