diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-28 14:53:33 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-31 01:53:25 +0200 |
| commit | 17337f54c057accf12b0e87d12f576194ad085a8 (patch) | |
| tree | 1b09c5750a307bbae18fbbcae93aa79b40bf602a /libswscale/utils.c | |
| parent | 43b73d59a8b6cba60b0401b39f0f577bc6c1df9e (diff) | |
| download | ffmpeg-17337f54c057accf12b0e87d12f576194ad085a8.tar.gz | |
x86: Split inline and external assembly #ifdefs
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index f890b5cee1..200346cab5 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -577,7 +577,7 @@ fail: return ret; } -#if HAVE_MMXEXT && HAVE_INLINE_ASM +#if HAVE_MMXEXT_INLINE static int initMMX2HScaler(int dstW, int xInc, uint8_t *filterCode, int16_t *filter, int32_t *filterPos, int numSplits) { @@ -740,7 +740,7 @@ static int initMMX2HScaler(int dstW, int xInc, uint8_t *filterCode, return fragmentPos + 1; } -#endif /* HAVE_MMXEXT && HAVE_INLINE_ASM */ +#endif /* HAVE_MMXEXT_INLINE */ static void getSubSampleFactors(int *h, int *v, enum PixelFormat format) { @@ -1012,7 +1012,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, /* precalculate horizontal scaler filter coefficients */ { -#if HAVE_MMXEXT && HAVE_INLINE_ASM +#if HAVE_MMXEXT_INLINE // can't downscale !!! if (c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR)) { c->lumMmx2FilterCodeSize = initMMX2HScaler(dstW, c->lumXInc, NULL, @@ -1048,7 +1048,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, mprotect(c->chrMmx2FilterCode, c->chrMmx2FilterCodeSize, PROT_EXEC | PROT_READ); #endif } else -#endif /* HAVE_MMXEXT && HAVE_INLINE_ASM */ +#endif /* HAVE_MMXEXT_INLINE */ { const int filterAlign = (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) ? 4 : @@ -1621,7 +1621,7 @@ void sws_freeContext(SwsContext *c) av_freep(&c->hLumFilterPos); av_freep(&c->hChrFilterPos); -#if HAVE_MMX +#if HAVE_MMX_INLINE #ifdef MAP_ANONYMOUS if (c->lumMmx2FilterCode) munmap(c->lumMmx2FilterCode, c->lumMmx2FilterCodeSize); @@ -1638,7 +1638,7 @@ void sws_freeContext(SwsContext *c) #endif c->lumMmx2FilterCode = NULL; c->chrMmx2FilterCode = NULL; -#endif /* HAVE_MMX */ +#endif /* HAVE_MMX_INLINE */ av_freep(&c->yuvTable); av_free(c->formatConvBuffer); |