aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Smalley <casey.smalley@arm.com>2023-07-27 11:26:26 +0100
committerMartin Storsjö <martin@martin.st>2023-08-08 13:46:07 +0300
commitb98ee1a355e45d617e2b2a19722f74b4fe724ed3 (patch)
treeceaa165d6e7d343b2458ae0275f213f7c34ce0be
parent418c954e318a79f77eae1b4d6b29d40daee4284a (diff)
downloadffmpeg-b98ee1a355e45d617e2b2a19722f74b4fe724ed3.tar.gz
aarch64/hevc: Replace br return with ret
This patch changes the return instruction in the tr_32x4 macro from BR to RET. Function returns should always use the RET instruction instead of BR, to avoid interfering with branch prediction. On devices that support BTI, this is observeable as a landing pad is required when branching with BR. The change fixes fate-hevc-hdr-vivid-metadata when on hardware with BTI support. Signed-off-by: Casey Smalley <casey.smalley@arm.com> Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/aarch64/hevcdsp_idct_neon.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aarch64/hevcdsp_idct_neon.S b/libavcodec/aarch64/hevcdsp_idct_neon.S
index f7142c939c..ba8a1ebaed 100644
--- a/libavcodec/aarch64/hevcdsp_idct_neon.S
+++ b/libavcodec/aarch64/hevcdsp_idct_neon.S
@@ -790,7 +790,7 @@ function func_tr_32x4_\name
add x3, x11, #(32 + 3 * 64)
scale_store \shift
- br x10
+ ret x10
endfunc
.endm