summaryrefslogtreecommitdiff
path: root/libavcodec/x86/mathops.h
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-03-16 11:26:48 +0100
committerLuca Barbato <lu_zero@gentoo.org>2015-03-17 12:31:04 +0100
commit48aef27f5232794e70ecef0d347b9f65e27a9bad (patch)
treed7e52e643ddd10b2da22386d474264c0d0f5a3d5 /libavcodec/x86/mathops.h
parent96dd04427fc46e5e25a5ac1f00753207e3aedb0c (diff)
downloadffmpeg-48aef27f5232794e70ecef0d347b9f65e27a9bad.tar.gz
x86: Put COPY3_IF_LT under HAVE_6REGS
It uses 6 registers, unbreaks building on hardened x86 system. Bug-Id: gentoo/541930 CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/x86/mathops.h')
-rw-r--r--libavcodec/x86/mathops.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
index a62094ee97..2c04d9d1bd 100644
--- a/libavcodec/x86/mathops.h
+++ b/libavcodec/x86/mathops.h
@@ -23,7 +23,9 @@
#define AVCODEC_X86_MATHOPS_H
#include "config.h"
+
#include "libavutil/common.h"
+#include "libavutil/x86/asm.h"
#if HAVE_INLINE_ASM
@@ -88,6 +90,7 @@ static inline av_const int mid_pred(int a, int b, int c)
return i;
}
+#if HAVE_6REGS
#define COPY3_IF_LT(x, y, a, b, c, d)\
__asm__ volatile(\
"cmpl %0, %3 \n\t"\
@@ -97,6 +100,8 @@ __asm__ volatile(\
: "+&r" (x), "+&r" (a), "+r" (c)\
: "r" (y), "r" (b), "r" (d)\
);
+#endif /* HAVE_6REGS */
+
#endif /* HAVE_I686 */
#define MASK_ABS(mask, level) \