diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 12:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 12:16:08 +0200 |
| commit | 3777e6b3bf65be9a925187a9d008c5d422fe17b5 (patch) | |
| tree | 6ab9a542129dd1bb6ac4ff6b572d714d1dba40c3 /libavcodec | |
| parent | 9317b73f11c34e550a2ffcf01540824dbaa36036 (diff) | |
| parent | b93e934aeea44f3e92f0acd960e5d10151f14379 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
fate: list lavfi tests in a makefile
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mips/mathops.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mips/mathops.h b/libavcodec/mips/mathops.h index b58361f74d..368290ac5b 100644 --- a/libavcodec/mips/mathops.h +++ b/libavcodec/mips/mathops.h @@ -57,7 +57,8 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b) __asm__ ("dmult %2, %3 \n\t" "mflo %1 \n\t" "daddu %0, %0, %1 \n\t" - : "+r"(d), "=&r"(m) : "r"(a), "r"(b)); + : "+r"(d), "=&r"(m) : "r"(a), "r"(b) + : "hi", "lo"); return d; } #define MAC64(d, a, b) ((d) = MAC64(d, a, b)) @@ -68,7 +69,8 @@ static inline av_const int64_t MLS64(int64_t d, int a, int b) __asm__ ("dmult %2, %3 \n\t" "mflo %1 \n\t" "dsubu %0, %0, %1 \n\t" - : "+r"(d), "=&r"(m) : "r"(a), "r"(b)); + : "+r"(d), "=&r"(m) : "r"(a), "r"(b) + : "hi", "lo"); return d; } #define MLS64(d, a, b) ((d) = MLS64(d, a, b)) |