aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-04-26 16:49:02 +0200
committerDiego Biurrun <diego@biurrun.de>2013-05-12 21:23:38 +0200
commitf54b55058a429c4eea5bae7e5bcb49bd29b34199 (patch)
tree72047044d0d383e765a0e1ee85f998458a3b2cae /libavcodec
parente08c946c6860a78b0c479551d5f6735361160cbd (diff)
downloadffmpeg-f54b55058a429c4eea5bae7e5bcb49bd29b34199.tar.gz
configure: Rename cmov processor capability to i686
The goal is to make the capapility slightly more general and have it cover the availability of the nopl instruction in addition to cmov.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/mathops.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
index cd408ac5a6..32c88705e5 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" \