diff options
| author | James Cowgill <james410@cowgill.org.uk> | 2015-03-05 17:40:14 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 14:01:31 +0100 |
| commit | eae13eae9d6499e81cd77bcd9e13f7bcb31b5577 (patch) | |
| tree | 7dd9a52b8312cdaed9203378efddc6ec09f31864 /libavcodec | |
| parent | a99de50ec7671c5224e27795572cc76236f1bdb6 (diff) | |
| download | ffmpeg-eae13eae9d6499e81cd77bcd9e13f7bcb31b5577.tar.gz | |
configure, mips: remove MIPS32R2, merging it with MIPSFPU
There are no independant uses of mips32r2 instructions except for the
FPU parts. Due to the heavy use of mips32r2 specifc fpu extensions, I
am guessing the original author intended MIPSFPU to imply MIPS32R2 anyway.
Since these fpu instructions are available on mips64 (non-r2), enable them
there as well.
Also remove the last occurence of HAVE_MIPS32R2 (which is coupled to
HAVE_MIPSFPU anyway).
mips32r2 is left in the list of options form compatability so that using
--disable-mips32r2 doesn't break anything.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mips/ac3dsp_mips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c index f33c6f1809..bd2a611627 100644 --- a/libavcodec/mips/ac3dsp_mips.c +++ b/libavcodec/mips/ac3dsp_mips.c @@ -199,7 +199,7 @@ static void ac3_update_bap_counts_mips(uint16_t mant_cnt[16], uint8_t *bap, } #endif -#if HAVE_MIPSFPU && HAVE_MIPS32R2 +#if HAVE_MIPSFPU static void float_to_fixed24_mips(int32_t *dst, const float *src, unsigned int len) { const float scale = 1 << 24; @@ -403,7 +403,7 @@ void ff_ac3dsp_init_mips(AC3DSPContext *c, int bit_exact) { c->bit_alloc_calc_bap = ac3_bit_alloc_calc_bap_mips; c->update_bap_counts = ac3_update_bap_counts_mips; #endif -#if HAVE_MIPSFPU && HAVE_MIPS32R2 +#if HAVE_MIPSFPU c->float_to_fixed24 = float_to_fixed24_mips; c->downmix = ac3_downmix_mips; #endif |