diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-04-05 20:37:10 -0700 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2020-04-11 14:00:32 +0200 |
| commit | 875ba2333340c2e13af370832e49c9371ffb0f91 (patch) | |
| tree | 6e560b0ce3acdfa816ee74868590770e41e425e9 /libavcodec/mips/aacdec_mips.c | |
| parent | dbc5c0c1c8b205b7f2af6c00177d99d5f44e9207 (diff) | |
| download | ffmpeg-875ba2333340c2e13af370832e49c9371ffb0f91.tar.gz | |
avcodec/aacdec: fix compilation under soft float MIPS
Place HAVE_MIPSFPU further up so that functions that use floating point
ASM are defined away. Otherwise compilation failures result when soft
float in enabled on the toolchain.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libavcodec/mips/aacdec_mips.c')
| -rw-r--r-- | libavcodec/mips/aacdec_mips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mips/aacdec_mips.c b/libavcodec/mips/aacdec_mips.c index 01a2b3087b..8e30652935 100644 --- a/libavcodec/mips/aacdec_mips.c +++ b/libavcodec/mips/aacdec_mips.c @@ -59,6 +59,7 @@ #include "libavutil/mips/asmdefs.h" #if HAVE_INLINE_ASM +#if HAVE_MIPSFPU static av_always_inline void float_copy(float *dst, const float *src, int count) { // Copy 'count' floats from src to dst @@ -282,7 +283,6 @@ static void apply_ltp_mips(AACContext *ac, SingleChannelElement *sce) } } -#if HAVE_MIPSFPU static av_always_inline void fmul_and_reverse(float *dst, const float *src0, const float *src1, int count) { /* Multiply 'count' floats in src0 by src1 and store the results in dst in reverse */ @@ -433,9 +433,9 @@ static void update_ltp_mips(AACContext *ac, SingleChannelElement *sce) void ff_aacdec_init_mips(AACContext *c) { #if HAVE_INLINE_ASM +#if HAVE_MIPSFPU c->imdct_and_windowing = imdct_and_windowing_mips; c->apply_ltp = apply_ltp_mips; -#if HAVE_MIPSFPU c->update_ltp = update_ltp_mips; #endif /* HAVE_MIPSFPU */ #endif /* HAVE_INLINE_ASM */ |