diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-03-16 11:26:48 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2015-05-31 11:10:31 -0400 |
| commit | 987a8f8514e07aba8136d491949d0b8d6bb183f9 (patch) | |
| tree | e500dfbf362d5654626353e2166d8989bf601ad2 | |
| parent | c7a983762ab40bca4f85be64995d5398a4307aa5 (diff) | |
| download | ffmpeg-987a8f8514e07aba8136d491949d0b8d6bb183f9.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
(cherry picked from commit 2af720fe5f0418612a8fc26b0147a0e10414fcbe)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/x86/mathops.h | 5 |
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) \ |