summaryrefslogtreecommitdiffstats
path: root/libavcodec/fmtconvert.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 11:21:16 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 11:21:16 +0100
commite97e2588ca74270a14cc1df5a2576a5ea59b119f (patch)
tree52cb16a1034fe98657c9c43bf222b9513c705516 /libavcodec/fmtconvert.c
parent10e075c138467b1fbe63cd9eec0dfd2c18cf903a (diff)
parenta0fc780a2093784e8664f88205ee1b215e109cee (diff)
downloadffmpeg-streaming-e97e2588ca74270a14cc1df5a2576a5ea59b119f.zip
ffmpeg-streaming-e97e2588ca74270a14cc1df5a2576a5ea59b119f.tar.gz
Merge commit 'a0fc780a2093784e8664f88205ee1b215e109cee'
* commit 'a0fc780a2093784e8664f88205ee1b215e109cee': arm64: int32_to_float_fmul neon asm Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/fmtconvert.c')
-rw-r--r--libavcodec/fmtconvert.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c
index 1de1d31..88ffcb0 100644
--- a/libavcodec/fmtconvert.c
+++ b/libavcodec/fmtconvert.c
@@ -46,8 +46,14 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx)
c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c;
c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c;
- if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx);
- if (ARCH_PPC) ff_fmt_convert_init_ppc(c, avctx);
- if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx);
- if (HAVE_MIPSFPU) ff_fmt_convert_init_mips(c);
+ if (ARCH_AARCH64)
+ ff_fmt_convert_init_aarch64(c, avctx);
+ if (ARCH_ARM)
+ ff_fmt_convert_init_arm(c, avctx);
+ if (ARCH_PPC)
+ ff_fmt_convert_init_ppc(c, avctx);
+ if (ARCH_X86)
+ ff_fmt_convert_init_x86(c, avctx);
+ if (HAVE_MIPSFPU)
+ ff_fmt_convert_init_mips(c);
}
OpenPOWER on IntegriCloud