[SCM] libav/experimental: MIPS: use inline asm only when supported by compiler

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:22:31 UTC 2013


The following commit has been merged in the experimental branch:
commit 7a5a168abe36c91087e58d89262a3658d21ea2cc
Author: Mans Rullgard <mans at mansr.com>
Date:   Thu Oct 7 01:25:31 2010 +0100

    MIPS: use inline asm only when supported by compiler

diff --git a/libavcodec/mips/mathops.h b/libavcodec/mips/mathops.h
index a1b04ed..b58361f 100644
--- a/libavcodec/mips/mathops.h
+++ b/libavcodec/mips/mathops.h
@@ -25,6 +25,8 @@
 #include "config.h"
 #include "libavutil/common.h"
 
+#if HAVE_INLINE_ASM
+
 #if HAVE_LOONGSON
 
 static inline av_const int64_t MAC64(int64_t d, int a, int b)
@@ -73,4 +75,6 @@ static inline av_const int64_t MLS64(int64_t d, int a, int b)
 
 #endif
 
+#endif /* HAVE_INLINE_ASM */
+
 #endif /* AVCODEC_MIPS_MATHOPS_H */
diff --git a/libavutil/mips/intreadwrite.h b/libavutil/mips/intreadwrite.h
index b7479d3..cd4a9a9 100644
--- a/libavutil/mips/intreadwrite.h
+++ b/libavutil/mips/intreadwrite.h
@@ -24,6 +24,8 @@
 #include <stdint.h>
 #include "config.h"
 
+#if HAVE_INLINE_ASM
+
 #define AV_RN32 AV_RN32
 static av_always_inline uint32_t AV_RN32(const void *p)
 {
@@ -91,4 +93,6 @@ static av_always_inline void AV_WN64(void *p, uint64_t v)
 
 #endif /* ARCH_MIPS64 */
 
+#endif /* HAVE_INLINE_ASM */
+
 #endif /* AVUTIL_MIPS_INTREADWRITE_H */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list