[FFmpeg-cvslog] mips/asmdefs: use _ABI64 as defined by gcc

James Cowgill git at videolan.org
Fri Mar 13 13:22:59 CET 2015


ffmpeg | branch: release/2.6 | James Cowgill <james410 at cowgill.org.uk> | Wed Mar 11 14:59:28 2015 +0000| [c58edf52f9c57e14887b1f56a0543bebe20360c3] | committer: Michael Niedermayer

mips/asmdefs: use _ABI64 as defined by gcc

Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header,
the easiest way around this is to just use the preprocessor definitions from
gcc / clang.

Signed-off-by: James Cowgill <james410 at cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a251aa1a350a1b9d3af07a7948efcc0add8e68ff)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/mips/asmdefs.h |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavutil/mips/asmdefs.h b/libavutil/mips/asmdefs.h
index a3a5ee3..fdf82a0 100644
--- a/libavutil/mips/asmdefs.h
+++ b/libavutil/mips/asmdefs.h
@@ -27,9 +27,7 @@
 #ifndef AVUTIL_MIPS_ASMDEFS_H
 #define AVUTIL_MIPS_ASMDEFS_H
 
-#include <sgidefs.h>
-
-#if _MIPS_SIM == _ABI64
+#if defined(_ABI64) && _MIPS_SIM == _ABI64
 # define PTRSIZE        " 8 "
 # define PTRLOG         " 3 "
 # define PTR_ADDU       "daddu "



More information about the ffmpeg-cvslog mailing list