diff options
| author | Martin Storsjö <martin@martin.st> | 2016-11-10 13:25:36 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-11-10 14:01:04 +0200 |
| commit | 11623217e3c9b859daee544e31acdd0821b61039 (patch) | |
| tree | bb3a2daabb0295fd1a73d06f44cb921f4a1b66f8 | |
| parent | 824e8c284054f323f854892d1b4739239ed1fdc7 (diff) | |
| download | ffmpeg-11623217e3c9b859daee544e31acdd0821b61039.tar.gz | |
arm: vp9mc: Use a different helper register for PIC loads
This fixes crashes since 557c1675cf in linux PIC builds.
Previously, movrelx silently used r12 as helper register, which
doesn't work when r12 is the destination register.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/arm/vp9mc_neon.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/vp9mc_neon.S b/libavcodec/arm/vp9mc_neon.S index 9deb6562a5..d3d2c7f96b 100644 --- a/libavcodec/arm/vp9mc_neon.S +++ b/libavcodec/arm/vp9mc_neon.S @@ -404,7 +404,7 @@ function ff_vp9_\type\()_\filter\()\size\()_h_neon, export=1 ldr r4, [sp, #16] ldr r5, [sp, #20] .endif - movrelx r12, X(ff_vp9_subpel_filters) + movrelx r12, X(ff_vp9_subpel_filters), r6 add r12, r12, 120*\offset - 8 cmp r5, #8 add r12, r12, r5, lsl #3 @@ -680,8 +680,8 @@ function ff_vp9_\type\()_\filter\()\size\()_v_neon, export=1 push {r4-r5} vpush {q4-q7} ldr r4, [sp, #72] + movrelx r12, X(ff_vp9_subpel_filters), r5 ldr r5, [sp, #80] - movrelx r12, X(ff_vp9_subpel_filters) add r12, r12, 120*\offset - 8 add r12, r12, r5, lsl #3 cmp r5, #8 |