diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 08:51:12 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 08:51:12 +0100 |
| commit | a04a9434b5ecfa0f17a36f88ac3e2634143a0169 (patch) | |
| tree | b192d59e24704ebb870c29ece5eb0211567fe029 /libavutil/arm | |
| parent | 7e299035268926eced26f442885403edab51e7fc (diff) | |
| parent | 73c8c0341cce9e1a6c4169721f5123f97fc4be2f (diff) | |
| download | ffmpeg-a04a9434b5ecfa0f17a36f88ac3e2634143a0169.tar.gz | |
Merge commit '73c8c0341cce9e1a6c4169721f5123f97fc4be2f'
* commit '73c8c0341cce9e1a6c4169721f5123f97fc4be2f':
arm: Fix vfp dead code elimination with have_vfp_vm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index 27a2edacf5..eb64ed5fcd 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -34,6 +34,6 @@ /* some functions use the VFPv2 vector mode which is deprecated in ARMv7-A * and might trap on such CPU depending on the OS configuration */ #define have_vfp_vm(flags) \ - (have_armv6(flags) && ((flags) & AV_CPU_FLAG_VFP_VM)) + (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP_VM)) #endif /* AVUTIL_ARM_CPU_H */ |