[FFmpeg-devel] [PATCH] mips/asmdefs: use asm/sgidefs.h header on linux

James Cowgill james410 at cowgill.org.uk
Sat Mar 7 11:13:23 CET 2015


Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header,
but the linux kernel does in asm/sgidefs.h. So use that header if we can.

Change _ABI64 to _MIPS_SIM_ABI64 which is defined in both headers.

Signed-off-by: James Cowgill <james410 at cowgill.org.uk>
---
 libavutil/mips/asmdefs.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavutil/mips/asmdefs.h b/libavutil/mips/asmdefs.h
index 4d2922c..3660e98 100644
--- a/libavutil/mips/asmdefs.h
+++ b/libavutil/mips/asmdefs.h
@@ -27,9 +27,13 @@
 #ifndef AVCODEC_MIPS_ASMDEFS_H
 #define AVCODEC_MIPS_ASMDEFS_H
 
+#ifdef __linux__
+#include <asm/sgidefs.h>
+#else
 #include <sgidefs.h>
+#endif
 
-#if _MIPS_SIM == _ABI64
+#if _MIPS_SIM == _MIPS_SIM_ABI64
 # define PTRSIZE        " 8 "
 # define PTRLOG         " 3 "
 # define PTR_ADDU       "daddu "
-- 
2.1.4



More information about the ffmpeg-devel mailing list