From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 23 Aug 2006 23:39:27 +0000 (+0000)
Subject: fix arm asm compilation in mpegaudiodec
X-Git-Tag: v0.5~12054
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acba32385b70f30b6197127d2b41a425b00bcaad;p=platform%2Fupstream%2Flibav.git

fix arm asm compilation in mpegaudiodec

Originally committed as revision 6057 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 4d10ad4..6ebbeed 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -59,13 +59,13 @@
 #   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)\
+                "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 MUL64(a,b) ((int64_t)(a) * (int64_t)(b))
-#   define MULH(a, b) ({ int lo, hi; asm ("smull %0, %1, %2, %3" : "=r"(lo), "=r"(hi) : "r"(b),"r"(a)); hi; })
+#   define MULH(a, b) ({ int lo, hi; asm ("smull %0, %1, %2, %3" : "=&r"(lo), "=&r"(hi) : "r"(b), "r"(a)); hi; })
 #else
 #   define MULL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS)
 #   define MUL64(a,b) ((int64_t)(a) * (int64_t)(b))