summaryrefslogtreecommitdiff
path: root/chromium/third_party/ffmpeg/libswresample
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 15:28:34 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-08-28 13:54:51 +0000
commit2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch)
treeeb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/third_party/ffmpeg/libswresample
parentb014812705fc80bff0a5c120dfcef88f349816dc (diff)
downloadqtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/ffmpeg/libswresample')
-rw-r--r--chromium/third_party/ffmpeg/libswresample/arm/audio_convert_neon.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/third_party/ffmpeg/libswresample/arm/audio_convert_neon.S b/chromium/third_party/ffmpeg/libswresample/arm/audio_convert_neon.S
index 7729514701d..085d50aafa5 100644
--- a/chromium/third_party/ffmpeg/libswresample/arm/audio_convert_neon.S
+++ b/chromium/third_party/ffmpeg/libswresample/arm/audio_convert_neon.S
@@ -22,7 +22,7 @@
#include "libavutil/arm/asm.S"
function swri_oldapi_conv_flt_to_s16_neon, export=1
-_swri_oldapi_conv_flt_to_s16_neon:
+.L_swri_oldapi_conv_flt_to_s16_neon:
subs r2, r2, #8
vld1.32 {q0}, [r1,:128]!
vcvt.s32.f32 q8, q0, #31
@@ -67,7 +67,7 @@ _swri_oldapi_conv_flt_to_s16_neon:
endfunc
function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1
-_swri_oldapi_conv_fltp_to_s16_2ch_neon:
+.L_swri_oldapi_conv_fltp_to_s16_2ch_neon:
ldm r1, {r1, r3}
subs r2, r2, #8
vld1.32 {q0}, [r1,:128]!
@@ -135,8 +135,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 .L_swri_oldapi_conv_flt_to_s16_neon
+ beq .L_swri_oldapi_conv_fltp_to_s16_2ch_neon
push {r4-r8, lr}
cmp r3, #4