diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 11:29:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 11:29:40 +0200 |
| commit | 69d52ef8ffcfc9246b58fd77b020f255ed64384b (patch) | |
| tree | 0d2341822e495ddd86dba363bcdcabc8d3433c1e /libavcodec | |
| parent | 6585275e79cd2cc29472c84a4786106ee41f7924 (diff) | |
| parent | f54b55058a429c4eea5bae7e5bcb49bd29b34199 (diff) | |
| download | ffmpeg-69d52ef8ffcfc9246b58fd77b020f255ed64384b.tar.gz | |
Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'
* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
configure: Rename cmov processor capability to i686
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/mathops.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h index 79e29e6232..e8eb274f54 100644 --- a/libavcodec/x86/mathops.h +++ b/libavcodec/x86/mathops.h @@ -68,7 +68,7 @@ static av_always_inline av_const int64_t MUL64(int a, int b) #endif /* ARCH_X86_32 */ -#if HAVE_CMOV +#if HAVE_I686 /* median of 3 */ #define mid_pred mid_pred static inline av_const int mid_pred(int a, int b, int c) @@ -87,9 +87,7 @@ static inline av_const int mid_pred(int a, int b, int c) ); return i; } -#endif -#if HAVE_CMOV #define COPY3_IF_LT(x, y, a, b, c, d)\ __asm__ volatile(\ "cmpl %0, %3 \n\t"\ @@ -99,7 +97,7 @@ __asm__ volatile(\ : "+&r" (x), "+&r" (a), "+r" (c)\ : "r" (y), "r" (b), "r" (d)\ ); -#endif +#endif /* HAVE_I686 */ #define MASK_ABS(mask, level) \ __asm__ ("cltd \n\t" \ |