[FFmpeg-cvslog] x86: Put COPY3_IF_LT under HAVE_6REGS

Luca Barbato git at videolan.org
Tue Mar 17 20:33:21 CET 2015


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Mar 16 11:26:48 2015 +0100| [48aef27f5232794e70ecef0d347b9f65e27a9bad] | committer: Luca Barbato

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48aef27f5232794e70ecef0d347b9f65e27a9bad
---

 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