ARM: disable inline asm for armcc
Originally committed as revision 17831 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1e65f62e2b
commit
35690321a7
@ -25,6 +25,8 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "libavutil/common.h"
|
#include "libavutil/common.h"
|
||||||
|
|
||||||
|
#if HAVE_INLINE_ASM
|
||||||
|
|
||||||
# define MULL MULL
|
# define MULL MULL
|
||||||
static inline av_const int MULL(int a, int b, unsigned shift)
|
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;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* HAVE_INLINE_ASM */
|
||||||
|
|
||||||
#endif /* AVCODEC_ARM_MATHOPS_H */
|
#endif /* AVCODEC_ARM_MATHOPS_H */
|
||||||
|
@ -134,7 +134,7 @@ extern const uint32_t ff_inverse[256];
|
|||||||
);\
|
);\
|
||||||
ret;\
|
ret;\
|
||||||
})
|
})
|
||||||
#elif HAVE_ARMV6
|
#elif HAVE_ARMV6 && HAVE_INLINE_ASM
|
||||||
static inline av_const int FASTDIV(int a, int b)
|
static inline av_const int FASTDIV(int a, int b)
|
||||||
{
|
{
|
||||||
int r, t;
|
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));
|
: "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
#elif ARCH_ARM
|
#elif ARCH_ARM && HAVE_INLINE_ASM
|
||||||
static inline av_const int FASTDIV(int a, int b)
|
static inline av_const int FASTDIV(int a, int b)
|
||||||
{
|
{
|
||||||
int r, t;
|
int r, t;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user