virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ARM: disable inline asm for armcc

Browse Source 
Originally committed as revision 17831 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2009-03-05 21:20:13 +00:00
parent 1e65f62e2b
commit 35690321a7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/arm/mathops.h
View File

@ -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 */

4
libavutil/internal.h
View File

@ -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;