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 /libavcodec/x86/h264_intrapred.asm | |
| 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 'libavcodec/x86/h264_intrapred.asm')
| -rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index b35af79e48..4fd8976429 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -120,7 +120,7 @@ cglobal pred16x16_horizontal_8, 2,3 INIT_MMX mmx PRED16x16_H -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_H INIT_XMM ssse3 PRED16x16_H @@ -180,7 +180,7 @@ cglobal pred16x16_dc_8, 2,7 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_DC INIT_XMM sse2 PRED16x16_DC @@ -229,7 +229,7 @@ cglobal pred16x16_tm_vp8_8, 2,5 INIT_MMX mmx PRED16x16_TM -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_TM INIT_XMM sse2 @@ -309,14 +309,14 @@ cglobal pred16x16_plane_%1_8, 2,9,7 movhlps m1, m0 %endif paddw m0, m1 -%if cpuflag(mmx2) +%if cpuflag(mmxext) PSHUFLW m1, m0, 0xE %elif cpuflag(mmx) mova m1, m0 psrlq m1, 32 %endif paddw m0, m1 -%if cpuflag(mmx2) +%if cpuflag(mmxext) PSHUFLW m1, m0, 0x1 %elif cpuflag(mmx) mova m1, m0 @@ -536,7 +536,7 @@ INIT_MMX mmx H264_PRED16x16_PLANE h264 H264_PRED16x16_PLANE rv40 H264_PRED16x16_PLANE svq3 -INIT_MMX mmx2 +INIT_MMX mmxext H264_PRED16x16_PLANE h264 H264_PRED16x16_PLANE rv40 H264_PRED16x16_PLANE svq3 @@ -582,7 +582,7 @@ cglobal pred8x8_plane_8, 2,9,7 paddw m0, m1 %if notcpuflag(ssse3) -%if cpuflag(mmx2) +%if cpuflag(mmxext) PSHUFLW m1, m0, 0xE %elif cpuflag(mmx) mova m1, m0 @@ -591,7 +591,7 @@ cglobal pred8x8_plane_8, 2,9,7 paddw m0, m1 %endif ; !ssse3 -%if cpuflag(mmx2) +%if cpuflag(mmxext) PSHUFLW m1, m0, 0x1 %elif cpuflag(mmx) mova m1, m0 @@ -716,7 +716,7 @@ ALIGN 16 INIT_MMX mmx H264_PRED8x8_PLANE -INIT_MMX mmx2 +INIT_MMX mmxext H264_PRED8x8_PLANE INIT_XMM sse2 H264_PRED8x8_PLANE @@ -763,7 +763,7 @@ cglobal pred8x8_horizontal_8, 2,3 INIT_MMX mmx PRED8x8_H -INIT_MMX mmx2 +INIT_MMX mmxext PRED8x8_H INIT_MMX ssse3 PRED8x8_H @@ -941,7 +941,7 @@ cglobal pred8x8_tm_vp8_8, 2,6 INIT_MMX mmx PRED8x8_TM -INIT_MMX mmx2 +INIT_MMX mmxext PRED8x8_TM INIT_XMM sse2 @@ -2442,7 +2442,7 @@ cglobal pred4x4_tm_vp8_8, 3,6 sub r3d, r4d movd mm2, r1d movd mm4, r3d -%if cpuflag(mmx2) +%if cpuflag(mmxext) pshufw mm2, mm2, 0 pshufw mm4, mm4, 0 %else @@ -2465,7 +2465,7 @@ cglobal pred4x4_tm_vp8_8, 3,6 INIT_MMX mmx PRED4x4_TM -INIT_MMX mmx2 +INIT_MMX mmxext PRED4x4_TM INIT_XMM ssse3 |