diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2016-02-24 16:38:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-09 20:05:04 +0100 |
| commit | ad16eff64ba78d8dc98a8324640025c7cb2857f3 (patch) | |
| tree | bec1d6bfbf92ce1a90c645d5dad006a6f9dea48d /libavcodec/mips/acelp_vectors_mips.c | |
| parent | a62d768894709b3cbdda88f558accf0099c08215 (diff) | |
| download | ffmpeg-ad16eff64ba78d8dc98a8324640025c7cb2857f3.tar.gz | |
mips: add support for R6
Understanding the mips32r6 and mips64r6 ISAs in the configure script is
not enough. In order to have full support for MIPS R6 in FFmpeg we need
to be able to build it, and for that we need to make sure we don't use
incompatible assembler code which makes the build fail. Ifdefing the
offending code is sufficient to fix the problem.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mips/acelp_vectors_mips.c')
| -rw-r--r-- | libavcodec/mips/acelp_vectors_mips.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mips/acelp_vectors_mips.c b/libavcodec/mips/acelp_vectors_mips.c index ad9434866e..0ab2b6a87b 100644 --- a/libavcodec/mips/acelp_vectors_mips.c +++ b/libavcodec/mips/acelp_vectors_mips.c @@ -57,6 +57,7 @@ #include "libavutil/mips/asmdefs.h" #if HAVE_INLINE_ASM +#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 static void ff_weighted_vector_sumf_mips( float *out, const float *in_a, const float *in_b, float weight_coeff_a, float weight_coeff_b, int length) @@ -92,11 +93,14 @@ static void ff_weighted_vector_sumf_mips( : "$f0", "$f1", "$f2", "$f3", "$f4", "$f5", "memory" ); } +#endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */ #endif /* HAVE_INLINE_ASM */ void ff_acelp_vectors_init_mips(ACELPVContext *c) { #if HAVE_INLINE_ASM +#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 c->weighted_vector_sumf = ff_weighted_vector_sumf_mips; #endif +#endif } |