Mercurial > mplayer.hg
changeset 19368:eb51949c73eb
Use COMPILE_MMX2 instead of HAVE_MMX2 to determine whether to compile
MMX2 code, because the HAVE_ defines do not have sane values here if
runtime cpudetection is used. Hopefully fixes runtime cpudetection
breakage from r19339.
| author | uau |
|---|---|
| date | Sat, 12 Aug 2006 17:46:40 +0000 |
| parents | c4601b2c3d5c |
| children | c97b028f0e6b |
| files | libswscale/swscale.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale.c Sat Aug 12 16:43:22 2006 +0000 +++ b/libswscale/swscale.c Sat Aug 12 17:46:40 2006 +0000 @@ -1241,7 +1241,7 @@ return 0; } -#ifdef HAVE_MMX2 +#ifdef COMPILE_MMX2 static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *filter, int32_t *filterPos, int numSplits) { uint8_t *fragmentA; @@ -1412,7 +1412,7 @@ } filterPos[i/2]= xpos>>16; // needed to jump to the next part } -#endif /* HAVE_MMX2 */ +#endif /* COMPILE_MMX2 */ static void globalInit(void){ // generating tables: @@ -2116,7 +2116,7 @@ srcFilter->chrH, dstFilter->chrH, c->param); #define MAX_FUNNY_CODE_SIZE 10000 -#if defined(HAVE_MMX2) +#if defined(COMPILE_MMX2) // can't downscale !!! if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR)) { @@ -2136,7 +2136,7 @@ initMMX2HScaler( dstW, c->lumXInc, c->funnyYCode , c->lumMmx2Filter, c->lumMmx2FilterPos, 8); initMMX2HScaler(c->chrDstW, c->chrXInc, c->funnyUVCode, c->chrMmx2Filter, c->chrMmx2FilterPos, 4); } -#endif /* defined(HAVE_MMX2) */ +#endif /* defined(COMPILE_MMX2) */ } // Init Horizontal stuff