[FFmpeg-cvslog] x86: Put COPY3_IF_LT under HAVE_6REGS
Luca Barbato
git at videolan.org
Mon Jun 1 12:14:05 CEST 2015
ffmpeg | branch: release/2.2 | Luca Barbato <lu_zero at gentoo.org> | Mon Mar 16 11:26:48 2015 +0100| [987a8f8514e07aba8136d491949d0b8d6bb183f9] | committer: Reinhard Tartler
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 at libav.org
(cherry picked from commit 2af720fe5f0418612a8fc26b0147a0e10414fcbe)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=987a8f8514e07aba8136d491949d0b8d6bb183f9
---
libavcodec/x86/mathops.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
index a62094e..2c04d9d 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) \
More information about the ffmpeg-cvslog
mailing list