[FFmpeg-cvslog] avutil/mips/intreadwrite: build fix for mips64r6 (instruction 'lwl' not supported)

Shivraj Patil git at videolan.org
Fri Apr 10 13:13:11 CEST 2015


ffmpeg | branch: master | Shivraj Patil <shivraj.patil at imgtec.com> | Thu Apr  9 20:12:04 2015 +0530| [578d99e7c6d1d8d3eabd24501b6758797e14fb33] | committer: Michael Niedermayer

avutil/mips/intreadwrite: build fix for mips64r6 (instruction 'lwl' not supported)

Signed-off-by: Shivraj Patil <shivraj.patil at imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic at imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=578d99e7c6d1d8d3eabd24501b6758797e14fb33
---

 libavutil/mips/intreadwrite.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/mips/intreadwrite.h b/libavutil/mips/intreadwrite.h
index 9ba0491..32084f6 100644
--- a/libavutil/mips/intreadwrite.h
+++ b/libavutil/mips/intreadwrite.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "config.h"
 
-#if ARCH_MIPS64 && HAVE_INLINE_ASM
+#if ARCH_MIPS64 && HAVE_INLINE_ASM && !HAVE_MIPS64R6
 
 #define AV_RN32 AV_RN32
 static av_always_inline uint32_t AV_RN32(const void *p)
@@ -41,6 +41,6 @@ static av_always_inline uint32_t AV_RN32(const void *p)
     return v;
 }
 
-#endif /* ARCH_MIPS64 && HAVE_INLINE_ASM */
+#endif /* ARCH_MIPS64 && HAVE_INLINE_ASM && !HAVE_MIPS64R6 */
 
 #endif /* AVUTIL_MIPS_INTREADWRITE_H */



More information about the ffmpeg-cvslog mailing list