diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 00:29:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 00:48:26 +0100 |
| commit | bf90abe1dd51b692a4ebdf466151f0788f2c5ca2 (patch) | |
| tree | addd33719da0d19a3840173fed9c9a6543354561 /libavresample/arm | |
| parent | 64278039e55ffc88d231a8d760ecc257a120760a (diff) | |
| parent | 5bcbb516f2ff45290ef7995b081762e668693672 (diff) | |
| download | ffmpeg-streaming-bf90abe1dd51b692a4ebdf466151f0788f2c5ca2.zip ffmpeg-streaming-bf90abe1dd51b692a4ebdf466151f0788f2c5ca2.tar.gz | |
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'
* commit '5bcbb516f2ff45290ef7995b081762e668693672':
arm: Add X() around all references to extern symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/arm')
| -rw-r--r-- | libavresample/arm/audio_convert_neon.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/arm/audio_convert_neon.S b/libavresample/arm/audio_convert_neon.S index 98f77f0..a120e87 100644 --- a/libavresample/arm/audio_convert_neon.S +++ b/libavresample/arm/audio_convert_neon.S @@ -133,8 +133,8 @@ function ff_conv_fltp_to_s16_neon, export=1 cmp r3, #2 itt lt ldrlt r1, [r1] - blt ff_conv_flt_to_s16_neon - beq ff_conv_fltp_to_s16_2ch_neon + blt X(ff_conv_flt_to_s16_neon) + beq X(ff_conv_fltp_to_s16_2ch_neon) push {r4-r8, lr} cmp r3, #4 |
