git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure, mips: remove MIPS32R2, merging it with MIPSFPU
[ffmpeg.git]
/
libavcodec
/
mips
/
ac3dsp_mips.c
diff --git
a/libavcodec/mips/ac3dsp_mips.c
b/libavcodec/mips/ac3dsp_mips.c
index
f33c6f1
..
bd2a611
100644
(file)
--- 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
}
#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;
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
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
c->float_to_fixed24 = float_to_fixed24_mips;
c->downmix = ac3_downmix_mips;
#endif