diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:09:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:10:39 +0200 |
| commit | e1c3e6277f095a258a3676263202a595c044f57b (patch) | |
| tree | 4e76431ceccf5d8180d1463037f6ac52373dbe75 /libavcodec/arm/fmtconvert_init_arm.c | |
| parent | 946f080b54b009271937035a71ee24b8b856e340 (diff) | |
| parent | f0389eb777b1ab4291329d4f709098cdfa7384dc (diff) | |
| download | ffmpeg-e1c3e6277f095a258a3676263202a595c044f57b.tar.gz | |
Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'
* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
arm: fmtconvert: Split armv6 fmtconvert code off from vfp code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fmtconvert_init_arm.c')
| -rw-r--r-- | libavcodec/arm/fmtconvert_init_arm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index 185f1b99dd..37319ed125 100644 --- a/libavcodec/arm/fmtconvert_init_arm.c +++ b/libavcodec/arm/fmtconvert_init_arm.c @@ -43,16 +43,15 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx { int cpu_flags = av_get_cpu_flags(); - if (have_vfp(cpu_flags) && have_armv6(cpu_flags)) { + if (have_vfp(cpu_flags)) { if (!have_vfpv3(cpu_flags)) { - // These functions don't use anything armv6 specific in themselves, - // but ff_float_to_int16_vfp which is in the same assembly source - // file does, thus the whole file requires armv6 to be built. 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; } - c->float_to_int16 = ff_float_to_int16_vfp; + if (have_armv6(cpu_flags)) { + c->float_to_int16 = ff_float_to_int16_vfp; + } } if (have_neon(cpu_flags)) { |