[FFmpeg-devel] [PATCH 2/2] swresample/aarch64: fix relocation out of range error

[Martin Storsjö]

On Mon, 13 Sep 2021, Zhao Zhili wrote:

> From: Zhao Zhili <zhilizhao at tencent.com>
>
> ---
> libswresample/aarch64/audio_convert_neon.S | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libswresample/aarch64/audio_convert_neon.S b/libswresample/aarch64/audio_convert_neon.S
> index 74feff448a..77779505b6 100644
> --- a/libswresample/aarch64/audio_convert_neon.S
> +++ b/libswresample/aarch64/audio_convert_neon.S
> @@ -131,8 +131,10 @@ endfunc
>
> function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
>         cmp             w3,  #2
> -        b.eq            X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
>         b.gt            1f
> +        b.lt            2f
> +        b               X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
> +2:
>         ldr             x1,  [x1]
>         b               X(swri_oldapi_conv_flt_to_s16_neon)
> 1:
> -- 
> 2.31.1

For this, instead of changing the code, maybe we could add local labels 
that can't be interposed by a symbol elsewhere? E.g. have a look at 
9dde6ab06c48f9447cd16f39bee33569cddb7be4.

// Martin