aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-30 11:57:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-30 11:57:35 +0200
commitf0a35623826e367fb1534c68222bfd4918e58a0f (patch)
tree43e7bc95c1fc15bdadd34fa0646268fcd6f438ee /libswscale/utils.c
parent01a82f1dc544df7a4affb3858d12b7b2e492cbba (diff)
parent79aec43ce813a3e270743ca64fa3f31fa43df80b (diff)
downloadffmpeg-f0a35623826e367fb1534c68222bfd4918e58a0f.tar.gz
Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'
* commit '79aec43ce813a3e270743ca64fa3f31fa43df80b': x86: Add and use more convenience macros to check CPU extension availability Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/utils.c')
-rw-r--r--libswscale/utils.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index d1285c3e87..53687f46c2 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1411,9 +1411,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
} else
#endif /* HAVE_MMXEXT_INLINE */
{
- const int filterAlign =
- (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 4 :
- PPC_ALTIVEC(cpu_flags) ? 8 : 1;
+ const int filterAlign = X86_MMX(cpu_flags) ? 4 :
+ PPC_ALTIVEC(cpu_flags) ? 8 : 1;
if (initFilter(&c->hLumFilter, &c->hLumFilterPos,
&c->hLumFilterSize, c->lumXInc,
@@ -1438,9 +1437,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
/* precalculate vertical scaler filter coefficients */
{
- const int filterAlign =
- (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 2 :
- PPC_ALTIVEC(cpu_flags) ? 8 : 1;
+ const int filterAlign = X86_MMX(cpu_flags) ? 2 :
+ PPC_ALTIVEC(cpu_flags) ? 8 : 1;
if (initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize,
c->lumYInc, srcH, dstH, filterAlign, (1 << 12),