[FFmpeg-cvslog] r15780 - trunk/libavcodec/armv4l/mathops.h
mru
subversion
Thu Nov 6 02:33:21 CET 2008
Author: mru
Date: Thu Nov 6 02:33:20 2008
New Revision: 15780
Log:
ARM: change MULL() macro to inline function
Modified:
trunk/libavcodec/armv4l/mathops.h
Modified: trunk/libavcodec/armv4l/mathops.h
==============================================================================
--- trunk/libavcodec/armv4l/mathops.h (original)
+++ trunk/libavcodec/armv4l/mathops.h Thu Nov 6 02:33:20 2008
@@ -26,14 +26,17 @@
#include "libavutil/common.h"
#ifdef FRAC_BITS
-# define MULL(a, b) \
- ({ int lo, hi;\
- __asm__("smull %0, %1, %2, %3 \n\t"\
- "mov %0, %0, lsr %4\n\t"\
- "add %1, %0, %1, lsl %5\n\t"\
- : "=&r"(lo), "=&r"(hi)\
- : "r"(b), "r"(a), "i"(FRAC_BITS), "i"(32-FRAC_BITS));\
- hi; })
+# define MULL MULL
+static inline av_const int MULL(int a, int b)
+{
+ int lo, hi;
+ __asm__("smull %0, %1, %2, %3 \n\t"
+ "mov %0, %0, lsr %4 \n\t"
+ "add %1, %0, %1, lsl %5 \n\t"
+ : "=&r"(lo), "=&r"(hi)
+ : "r"(b), "r"(a), "i"(FRAC_BITS), "i"(32-FRAC_BITS));
+ return hi;
+}
#endif
#ifdef HAVE_ARMV6
More information about the ffmpeg-cvslog
mailing list