diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:05:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:05:04 +0200 |
commit | 946f080b54b009271937035a71ee24b8b856e340 (patch) | |
tree | 30db756728f683b8dfe0d2640e9d4ad0133f52a8 /libavutil/arm/float_dsp_init_arm.c | |
parent | 99e7c702db5c42a79aaa48c502fec3e15d8cf308 (diff) | |
parent | 7ffda66fd5c81af4725bff7c2c4f207ba2aa0613 (diff) | |
download | ffmpeg-946f080b54b009271937035a71ee24b8b856e340.tar.gz |
Merge commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613'
* commit '7ffda66fd5c81af4725bff7c2c4f207ba2aa0613':
arm: float_dsp: Propagate cpu_flags to vfp initialization function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_arm.c')
-rw-r--r-- | libavutil/arm/float_dsp_init_arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c index 94d9c2bed3..38148b3878 100644 --- a/libavutil/arm/float_dsp_init_arm.c +++ b/libavutil/arm/float_dsp_init_arm.c @@ -28,7 +28,7 @@ av_cold void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) int cpu_flags = av_get_cpu_flags(); if (have_vfp(cpu_flags)) - ff_float_dsp_init_vfp(fdsp); + ff_float_dsp_init_vfp(fdsp, cpu_flags); if (have_neon(cpu_flags)) ff_float_dsp_init_neon(fdsp); } |