diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 02:08:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 02:08:20 +0200 |
commit | 40c29d42cfe5615b9e382b89f5bcba7a2d62cd29 (patch) | |
tree | 8ccd01ce4ee2252abdb96388dff9ea71e9c4ff72 /libavcodec/arm | |
parent | 3d0424f2ff3ae774d4237954186e4113976827e5 (diff) | |
parent | f635a233e377bedc6a39c9d8923ee3039fa5319f (diff) | |
download | ffmpeg-streaming-40c29d42cfe5615b9e382b89f5bcba7a2d62cd29.zip ffmpeg-streaming-40c29d42cfe5615b9e382b89f5bcba7a2d62cd29.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Remove unused variable.
ARM: simplify inline asm with 64-bit operands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/mathops.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index b4fb371..e889719 100644 --- a/libavcodec/arm/mathops.h +++ b/libavcodec/arm/mathops.h @@ -59,19 +59,16 @@ static inline av_const int MULH(int a, int b) static inline av_const int64_t MUL64(int a, int b) { - union { uint64_t x; unsigned hl[2]; } x; - __asm__ ("smull %0, %1, %2, %3" - : "=r"(x.hl[0]), "=r"(x.hl[1]) : "r"(a), "r"(b)); - return x.x; + int64_t x; + __asm__ ("smull %Q0, %R0, %1, %2" : "=r"(x) : "r"(a), "r"(b)); + return x; } #define MUL64 MUL64 static inline av_const int64_t MAC64(int64_t d, int a, int b) { - union { uint64_t x; unsigned hl[2]; } x = { d }; - __asm__ ("smlal %0, %1, %2, %3" - : "+r"(x.hl[0]), "+r"(x.hl[1]) : "r"(a), "r"(b)); - return x.x; + __asm__ ("smlal %Q0, %R0, %1, %2" : "+r"(d) : "r"(a), "r"(b)); + return d; } #define MAC64(d, a, b) ((d) = MAC64(d, a, b)) #define MLS64(d, a, b) MAC64(d, -(a), b) |