diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-07-10 00:04:18 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-11-14 00:58:51 +0100 |
| commit | 26301caaa1aec5d71b564bff452147d6183370bf (patch) | |
| tree | ecc309e5599ff4327c8ffe06ff515ecdf071735e /libswscale | |
| parent | da39cac8def7ea73cad2fa2b611209663c7abe2c (diff) | |
| download | ffmpeg-26301caaa1aec5d71b564bff452147d6183370bf.tar.gz | |
x86: mmx2 ---> mmxext in asm constructs
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/output.asm | 4 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 23508b8d82..d137e6ece2 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -247,7 +247,7 @@ cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset %endmacro %if ARCH_X86_32 -INIT_MMX mmx2 +INIT_MMX mmxext yuv2planeX_fn 8, 0, 7 yuv2planeX_fn 9, 0, 5 yuv2planeX_fn 10, 0, 5 @@ -388,7 +388,7 @@ INIT_MMX mmx yuv2plane1_fn 8, 0, 5 yuv2plane1_fn 16, 0, 3 -INIT_MMX mmx2 +INIT_MMX mmxext yuv2plane1_fn 9, 0, 3 yuv2plane1_fn 10, 0, 3 %endif diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 571510ae43..c48e56db4b 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -250,7 +250,7 @@ extern void ff_yuv2planeX_ ## size ## _ ## opt(const int16_t *filter, int filter VSCALEX_FUNC(10, opt) #if ARCH_X86_32 -VSCALEX_FUNCS(mmx2); +VSCALEX_FUNCS(mmxext); #endif VSCALEX_FUNCS(sse2); VSCALEX_FUNCS(sse4); @@ -267,7 +267,7 @@ extern void ff_yuv2plane1_ ## size ## _ ## opt(const int16_t *src, uint8_t *dst, VSCALE_FUNC(16, opt1) #if ARCH_X86_32 -VSCALE_FUNCS(mmx, mmx2); +VSCALE_FUNCS(mmx, mmxext); #endif VSCALE_FUNCS(sse2, sse2); VSCALE_FUNC(16, sse4); @@ -360,7 +360,7 @@ switch(c->dstBpc){ \ if (EXTERNAL_MMX(cpu_flags)) { ASSIGN_MMX_SCALE_FUNC(c->hyScale, c->hLumFilterSize, mmx, mmx); ASSIGN_MMX_SCALE_FUNC(c->hcScale, c->hChrFilterSize, mmx, mmx); - ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmx2, cpu_flags & AV_CPU_FLAG_MMXEXT); + ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmxext, cpu_flags & AV_CPU_FLAG_MMXEXT); switch (c->srcFormat) { case AV_PIX_FMT_Y400A: @@ -393,7 +393,7 @@ switch(c->dstBpc){ \ } } if (EXTERNAL_MMXEXT(cpu_flags)) { - ASSIGN_VSCALEX_FUNC(c->yuv2planeX, mmx2, , 1); + ASSIGN_VSCALEX_FUNC(c->yuv2planeX, mmxext, , 1); } #endif /* ARCH_X86_32 */ #define ASSIGN_SSE_SCALE_FUNC(hscalefn, filtersize, opt1, opt2) \ |