diff options
| author | Måns Rullgård <mans@mansr.com> | 2009-03-05 21:20:13 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2009-03-05 21:20:13 +0000 |
| commit | 35690321a72348b8c45bdaa1618d98ad7e628b80 (patch) | |
| tree | e30b43d08fe8194e5966aa9ff498937ffbe3137b | |
| parent | 1e65f62e2b15f087e14d62f567266994f1a9ec59 (diff) | |
| download | ffmpeg-35690321a72348b8c45bdaa1618d98ad7e628b80.tar.gz | |
ARM: disable inline asm for armcc
Originally committed as revision 17831 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/arm/mathops.h | 4 | ||||
| -rw-r--r-- | libavutil/internal.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index 0d8e044241..2da9c1cab3 100644 --- a/libavcodec/arm/mathops.h +++ b/libavcodec/arm/mathops.h @@ -25,6 +25,8 @@ #include <stdint.h> #include "libavutil/common.h" +#if HAVE_INLINE_ASM + # define MULL MULL static inline av_const int MULL(int a, int b, unsigned shift) { @@ -108,4 +110,6 @@ static inline av_const int mid_pred(int a, int b, int c) return m; } +#endif /* HAVE_INLINE_ASM */ + #endif /* AVCODEC_ARM_MATHOPS_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index f5f769e2c0..4191aa8e52 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -134,7 +134,7 @@ extern const uint32_t ff_inverse[256]; );\ ret;\ }) -#elif HAVE_ARMV6 +#elif HAVE_ARMV6 && HAVE_INLINE_ASM static inline av_const int FASTDIV(int a, int b) { int r, t; @@ -145,7 +145,7 @@ static inline av_const int FASTDIV(int a, int b) : "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse)); return r; } -#elif ARCH_ARM +#elif ARCH_ARM && HAVE_INLINE_ASM static inline av_const int FASTDIV(int a, int b) { int r, t; |