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

[Nedeljko Babic]

LGTM

Thanks,
Nedeljko
________________________________________
Od: ffmpeg-devel-bounces at ffmpeg.org [ffmpeg-devel-bounces at ffmpeg.org] u ime korisnika Shivraj Patil
Poslato: 9. april 2015 16:24
Za: ffmpeg-devel at ffmpeg.org
Cc: Shivraj Patil
Tema: [FFmpeg-devel] [PATCH 4/4] avutil/mips/intreadwrite: build fix for        mips64r6 (instruction 'lwl' not supported)

From: Shivraj Patil <shivraj.patil at imgtec.com>

Signed-off-by: Shivraj Patil <shivraj.patil at imgtec.com>
---
 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 */
--
2.3.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel at ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel