diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 12:34:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 12:34:30 +0100 |
| commit | a1b5c9634e87160251fd41635beb01da157cf00c (patch) | |
| tree | a62b214125e71d0f6a0a7ce910100a3641cc010e /libswscale/x86 | |
| parent | b0c543b1deba77647911be159b013760b5d05db3 (diff) | |
| parent | 26301caaa1aec5d71b564bff452147d6183370bf (diff) | |
| download | ffmpeg-a1b5c9634e87160251fd41635beb01da157cf00c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: mmx2 ---> mmxext in asm constructs
Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
| -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 e4707bedf6..d57af9b1a9 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 @@ -390,7 +390,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 fd14021e1f..02c454e08f 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -317,7 +317,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); @@ -334,7 +334,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); @@ -442,7 +442,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: @@ -475,7 +475,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) \ |