summaryrefslogtreecommitdiff
path: root/libavresample/audio_convert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-22 23:32:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-22 23:33:07 +0200
commit96a4d0c1c3cf32ca9c98608b8c852d5c64f436bf (patch)
tree0e5578683a94dd763dbd47de70cf90ca5842a81b /libavresample/audio_convert.c
parentef1961e7fc097db34557e5aaac55e5c50287adb9 (diff)
parentf4d5a2cc35fcdf06ec031fabe8b0710e995fe924 (diff)
Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'
* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924': aarch64: NEON float to s16 audio conversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.c')
-rw-r--r--libavresample/audio_convert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index e73105d54e..e68d5727f4 100644
--- a/libavresample/audio_convert.c
+++ b/libavresample/audio_convert.c
@@ -301,6 +301,8 @@ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr,
set_generic_function(ac);
+ if (ARCH_AARCH64)
+ ff_audio_convert_init_aarch64(ac);
if (ARCH_ARM)
ff_audio_convert_init_arm(ac);
if (ARCH_X86)