diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2016-04-26 12:17:14 +0530 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-26 12:27:39 +0200 |
| commit | a5638dbfbafd9162a201692b4b76981180c87d34 (patch) | |
| tree | 77c9adbf30deb011f078593d8362afa6ea8775db /libavcodec/mips/lsp_mips.h | |
| parent | 666754c665713d02750fa8b882627602e589ebce (diff) | |
| download | ffmpeg-a5638dbfbafd9162a201692b4b76981180c87d34.tar.gz | |
mips: add support for R6
Note:- backporting commit ad16eff64ba78d8dc98a8324640025c7cb2857f3 from head
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/lsp_mips.h')
| -rw-r--r-- | libavcodec/mips/lsp_mips.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h index 1e899bcd7c..6219c5aa40 100644 --- a/libavcodec/mips/lsp_mips.h +++ b/libavcodec/mips/lsp_mips.h @@ -55,6 +55,7 @@ #define AVCODEC_MIPS_LSP_MIPS_H #if HAVE_MIPSFPU && HAVE_INLINE_ASM +#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 #include "libavutil/mips/asmdefs.h" static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int lp_half_order) @@ -107,5 +108,6 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int } } #define ff_lsp2polyf ff_lsp2polyf_mips +#endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */ #endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM */ #endif /* AVCODEC_MIPS_LSP_MIPS_H */ |