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_10bit.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_10bit.asm')
| -rw-r--r-- | libavcodec/x86/h264_intrapred_10bit.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/x86/h264_intrapred_10bit.asm b/libavcodec/x86/h264_intrapred_10bit.asm index 039af6d712..db2b25ce57 100644 --- a/libavcodec/x86/h264_intrapred_10bit.asm +++ b/libavcodec/x86/h264_intrapred_10bit.asm @@ -188,7 +188,7 @@ PRED4x4_HD HADDD %1, %2 %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext cglobal pred4x4_dc_10, 3, 3 sub r0, r2 lea r1, [r0+r2*2] @@ -271,7 +271,7 @@ PRED4x4_VL ;----------------------------------------------------------------------------- ; void pred4x4_horizontal_up(pixel *src, const pixel *topright, int stride) ;----------------------------------------------------------------------------- -INIT_MMX mmx2 +INIT_MMX mmxext cglobal pred4x4_horizontal_up_10, 3, 3 sub r0, r2 lea r1, [r0+r2*2] @@ -420,7 +420,7 @@ cglobal pred8x8_dc_10, 2, 6 RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED8x8_DC pshufw INIT_XMM sse2 PRED8x8_DC pshuflw @@ -534,7 +534,7 @@ cglobal pred8x8l_128_dc_10, 4, 4 RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED8x8L_128_DC INIT_XMM sse2 PRED8x8L_128_DC @@ -1033,7 +1033,7 @@ cglobal pred16x16_vertical_10, 2, 3 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_VERTICAL INIT_XMM sse2 PRED16x16_VERTICAL @@ -1057,7 +1057,7 @@ cglobal pred16x16_horizontal_10, 2, 3 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_HORIZONTAL INIT_XMM sse2 PRED16x16_HORIZONTAL @@ -1103,7 +1103,7 @@ cglobal pred16x16_dc_10, 2, 6 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_DC INIT_XMM sse2 PRED16x16_DC @@ -1135,7 +1135,7 @@ cglobal pred16x16_top_dc_10, 2, 3 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_TOP_DC INIT_XMM sse2 PRED16x16_TOP_DC @@ -1172,7 +1172,7 @@ cglobal pred16x16_left_dc_10, 2, 6 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_LEFT_DC INIT_XMM sse2 PRED16x16_LEFT_DC @@ -1193,7 +1193,7 @@ cglobal pred16x16_128_dc_10, 2,3 REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext PRED16x16_128_DC INIT_XMM sse2 PRED16x16_128_DC |