diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:08:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:08:49 +0100 |
| commit | 4b874fc4fc2739db7a907ce430ac862e625b7387 (patch) | |
| tree | f3e116c3be4782c51b3843daa06dcb754e24ce27 /libswscale/x86 | |
| parent | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (diff) | |
| parent | a65bdceb060628881578afb29df4eb222421381f (diff) | |
| download | ffmpeg-4b874fc4fc2739db7a907ce430ac862e625b7387.tar.gz | |
Merge commit 'a65bdceb060628881578afb29df4eb222421381f'
* commit 'a65bdceb060628881578afb29df4eb222421381f':
x86: mmx2 ---> mmxext in variable names
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/swscale_template.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c index c61a63f53a..5815718cfa 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -1452,7 +1452,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; @@ -1525,7 +1525,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 @@ -1548,7 +1548,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); @@ -1609,7 +1609,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 @@ -1692,8 +1692,7 @@ static av_cold void RENAME(sws_init_swScale)(SwsContext *c) if (c->srcBpc == 8 && c->dstBpc <= 14) { // 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 { |