Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / libavcodec / arm / fft_init_arm.c

diff --git a/src/third_party/ffmpeg/libavcodec/arm/fft_init_arm.c b/src/third_party/ffmpeg/libavcodec/arm/fft_init_arm.c
index 7e49b9c..5087f5f 100644 (file)
--- a/src/third_party/ffmpeg/libavcodec/arm/fft_init_arm.c
+++ b/src/third_party/ffmpeg/libavcodec/arm/fft_init_arm.c
@@ -23,6 +23,8 @@
 #include "libavcodec/rdft.h"
 #include "libavcodec/synth_filter.h"
 
+void ff_fft_calc_vfp(FFTContext *s, FFTComplex *z);
+
 void ff_fft_permute_neon(FFTContext *s, FFTComplex *z);
 void ff_fft_calc_neon(FFTContext *s, FFTComplex *z);
 
@@ -38,10 +40,10 @@ av_cold void ff_fft_init_arm(FFTContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (have_vfp(cpu_flags)) {
+    if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) {
+        s->fft_calc     = ff_fft_calc_vfp;
 #if CONFIG_MDCT
-        if (!have_vfpv3(cpu_flags))
-            s->imdct_half   = ff_imdct_half_vfp;
+        s->imdct_half   = ff_imdct_half_vfp;
 #endif
     }