diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-06-04 23:07:44 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-06-05 17:14:10 +0200 |
| commit | 5bf84a584e9ce681b439a5747671e2809a019c83 (patch) | |
| tree | 994a2dd0a3a704676e6b670386289e3cf05fbb47 /libavutil | |
| parent | d3585c53debe4563533def485c9eef876e538073 (diff) | |
| download | ffmpeg-5bf84a584e9ce681b439a5747671e2809a019c83.tar.gz | |
arm: only enable setend on ARMv6
Without this check it causes SIGILL crashes on ARMv5.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index f1683e8d76..02def0b470 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -128,7 +128,7 @@ int ff_get_cpu_flags_arm(void) trickle down. */ if (flags & (AV_CPU_FLAG_VFPV3 | AV_CPU_FLAG_NEON)) flags |= AV_CPU_FLAG_ARMV6T2; - else + else if (flags & (AV_CPU_FLAG_ARMV6T2 | AV_CPU_FLAG_ARMV6)) /* Some functions use the 'setend' instruction which is deprecated on ARMv8 * and serializing on some ARMv7 cores. This ensures such functions * are only enabled on ARMv6. */ |