mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Fix libswresample compilation with Apple Neon assembler. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1355cafcb6
|
@ -133,8 +133,8 @@ function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
|
|||
cmp r3, #2
|
||||
itt lt
|
||||
ldrlt r1, [r1]
|
||||
blt swri_oldapi_conv_flt_to_s16_neon
|
||||
beq swri_oldapi_conv_fltp_to_s16_2ch_neon
|
||||
blt X(swri_oldapi_conv_flt_to_s16_neon)
|
||||
beq X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
|
||||
|
||||
push {r4-r8, lr}
|
||||
cmp r3, #4
|
||||
|
|
Loading…
Reference in New Issue