summaryrefslogtreecommitdiff
path: root/libavcodec/arm/fmtconvert_init_arm.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 11:01:29 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 11:01:29 +0100
commite754c8e8caa78d75efff5cb2d979635477c20378 (patch)
tree15d6289f14563c8db638f565dd0e8f75e18cbd71 /libavcodec/arm/fmtconvert_init_arm.c
parent00e91d06767a5a28524cbfc271141970f744db23 (diff)
parente2710e790c09e49e86baa58c6063af0097cc8cb0 (diff)
Merge commit 'e2710e790c09e49e86baa58c6063af0097cc8cb0'
* commit 'e2710e790c09e49e86baa58c6063af0097cc8cb0': arm: add a cpu flag for the VFPv2 vector mode Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/arm/fmtconvert_init_arm.c')
-rw-r--r--libavcodec/arm/fmtconvert_init_arm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c
index 58589c46ef..69b75bb274 100644
--- a/libavcodec/arm/fmtconvert_init_arm.c
+++ b/libavcodec/arm/fmtconvert_init_arm.c
@@ -38,7 +38,7 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx
{
int cpu_flags = av_get_cpu_flags();
- if (have_vfp(cpu_flags)) {
+ if (have_vfp_vm(cpu_flags)) {
if (!have_vfpv3(cpu_flags)) {
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp;
c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp;