From a65bdceb060628881578afb29df4eb222421381f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 8 Jul 2012 19:55:31 +0200 Subject: x86: mmx2 ---> mmxext in variable names --- libswscale/x86/swscale_template.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libswscale/x86') diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c index 8be6398f59..d7a2fdbe18 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -1378,7 +1378,7 @@ static void RENAME(hyscale_fast)(SwsContext *c, int16_t *dst, { int32_t *filterPos = c->hLumFilterPos; int16_t *filter = c->hLumFilter; - void *mmx2FilterCode= c->lumMmx2FilterCode; + void *mmxextFilterCode = c->lumMmxextFilterCode; int i; #if defined(PIC) uint64_t ebxsave; @@ -1451,7 +1451,7 @@ static void RENAME(hyscale_fast)(SwsContext *c, int16_t *dst, #endif #endif :: "m" (src), "m" (dst), "m" (filter), "m" (filterPos), - "m" (mmx2FilterCode) + "m" (mmxextFilterCode) #if defined(PIC) ,"m" (ebxsave) #endif @@ -1474,7 +1474,7 @@ static void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *dst2, { int32_t *filterPos = c->hChrFilterPos; int16_t *filter = c->hChrFilter; - void *mmx2FilterCode= c->chrMmx2FilterCode; + void *mmxextFilterCode = c->chrMmxextFilterCode; int i; #if defined(PIC) DECLARE_ALIGNED(8, uint64_t, ebxsave); @@ -1535,7 +1535,7 @@ static void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *dst2, #endif #endif :: "m" (src1), "m" (dst1), "m" (filter), "m" (filterPos), - "m" (mmx2FilterCode), "m" (src2), "m"(dst2) + "m" (mmxextFilterCode), "m" (src2), "m"(dst2) #if defined(PIC) ,"m" (ebxsave) #endif @@ -1617,8 +1617,7 @@ static av_cold void RENAME(sws_init_swScale)(SwsContext *c) if (c->srcBpc == 8 && c->dstBpc <= 10) { // Use the new MMX scaler if the MMXEXT one can't be used (it is faster than the x86 ASM one). #if COMPILE_TEMPLATE_MMXEXT - if (c->flags & SWS_FAST_BILINEAR && c->canMMX2BeUsed) - { + if (c->flags & SWS_FAST_BILINEAR && c->canMMXEXTBeUsed) { c->hyscale_fast = RENAME(hyscale_fast); c->hcscale_fast = RENAME(hcscale_fast); } else { -- cgit v1.2.3