projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b911711
)
ARM: change MUL16() macro to inline function
author
Måns Rullgård
<mans@mansr.com>
Thu, 6 Nov 2008 01:33:28 +0000
(
01:33
+0000)
committer
Måns Rullgård
<mans@mansr.com>
Thu, 6 Nov 2008 01:33:28 +0000
(
01:33
+0000)
Originally committed as revision 15783 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/armv4l/mathops.h
patch
|
blob
|
history
diff --git
a/libavcodec/armv4l/mathops.h
b/libavcodec/armv4l/mathops.h
index
5c33cab
..
37a0d3f
100644
(file)
--- 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