[SCM] libav/experimental: ARM: change MUL16() macro to inline function

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d00e8b83f10cfa0d7e7b1d89a03f092f019322c3
Author: Måns Rullgård <mans at mansr.com>
Date:   Thu Nov 6 01:33:28 2008 +0000

    ARM: change MUL16() macro to inline function
    
    Originally committed as revision 15783 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index 5c33cab..37a0d3f 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
 

-- 
Libav/FFmpeg packaging