diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-11-06 01:33:28 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-11-06 01:33:28 +0000 |
| commit | d00e8b83f10cfa0d7e7b1d89a03f092f019322c3 (patch) | |
| tree | 61819a1b5d98689f215e204aee605df0dc56b6eb | |
| parent | b9117115716dc706b82d416e0f0de933bced0f09 (diff) | |
| download | ffmpeg-d00e8b83f10cfa0d7e7b1d89a03f092f019322c3.tar.gz | |
ARM: change MUL16() macro to inline function
Originally committed as revision 15783 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/armv4l/mathops.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h index 5c33cabb63..37a0d3fcac 100644 --- a/libavcodec/armv4l/mathops.h +++ b/libavcodec/armv4l/mathops.h @@ -82,10 +82,13 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b) __asm__ ("smlabb %0, %1, %2, %0" : "+r"(rt) : "r"(ra), "r"(rb)); /* signed 16x16 -> 32 multiply */ -# define MUL16(ra, rb) \ - ({ int rt; \ - __asm__ ("smulbb %0, %1, %2" : "=r" (rt) : "r" (ra), "r" (rb)); \ - rt; }) +# define MUL16 MUL16 +static inline av_const MUL16(int ra, int rb) +{ + int rt; + __asm__ ("smulbb %0, %1, %2" : "=r"(rt) : "r"(ra), "r"(rb)); + return rt; +} #endif |