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/aacsbr_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/aacsbr_mips.c')
| -rw-r--r-- | libavcodec/mips/aacsbr_mips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c index 56aa4e8682..2e0cd723d7 100644 --- a/libavcodec/mips/aacsbr_mips.c +++ b/libavcodec/mips/aacsbr_mips.c @@ -58,6 +58,7 @@ #define ENVELOPE_ADJUSTMENT_OFFSET 2 #if HAVE_INLINE_ASM +#if HAVE_MIPSFPU static int sbr_lf_gen_mips(AACContext *ac, SpectralBandReplication *sbr, float X_low[32][40][2], const float W[2][32][32][2], int buf_idx) @@ -310,7 +311,6 @@ static int sbr_x_gen_mips(SpectralBandReplication *sbr, float X[2][38][64], return 0; } -#if HAVE_MIPSFPU #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 static void sbr_hf_assemble_mips(float Y1[38][64][2], const float X_high[64][40][2], @@ -611,9 +611,9 @@ static void sbr_hf_inverse_filter_mips(SBRDSPContext *dsp, void ff_aacsbr_func_ptr_init_mips(AACSBRContext *c) { #if HAVE_INLINE_ASM +#if HAVE_MIPSFPU c->sbr_lf_gen = sbr_lf_gen_mips; c->sbr_x_gen = sbr_x_gen_mips; -#if HAVE_MIPSFPU #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 c->sbr_hf_inverse_filter = sbr_hf_inverse_filter_mips; c->sbr_hf_assemble = sbr_hf_assemble_mips; |