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_deblock.asm | |
| parent | b0c543b1deba77647911be159b013760b5d05db3 (diff) | |
| parent | 26301caaa1aec5d71b564bff452147d6183370bf (diff) | |
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_deblock.asm')
| -rw-r--r-- | libavcodec/x86/h264_deblock.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 53f940173d..cf7562141a 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -506,7 +506,7 @@ cglobal deblock_h_luma_8, 0,5 RET %endmacro ; DEBLOCK_LUMA -INIT_MMX mmx2 +INIT_MMX mmxext DEBLOCK_LUMA v8, 8 INIT_XMM sse2 DEBLOCK_LUMA v, 16 @@ -789,11 +789,11 @@ INIT_XMM avx DEBLOCK_LUMA_INTRA v %endif %if ARCH_X86_64 == 0 -INIT_MMX mmx2 +INIT_MMX mmxext DEBLOCK_LUMA_INTRA v8 %endif -INIT_MMX mmx2 +INIT_MMX mmxext %macro CHROMA_V_START 0 dec r2d ; alpha-1 @@ -824,7 +824,7 @@ cglobal deblock_v_chroma_8, 5,6 movq m1, [t5+r1] movq m2, [r0] movq m3, [r0+r1] - call ff_chroma_inter_body_mmx2 + call ff_chroma_inter_body_mmxext movq [t5+r1], m1 movq [r0], m2 RET @@ -862,7 +862,7 @@ cglobal deblock_h_chroma_8, 5,7 RET ALIGN 16 -ff_chroma_inter_body_mmx2: +ff_chroma_inter_body_mmxext: LOAD_MASK r2d, r3d movd m6, [r4] ; tc0 punpcklbw m6, m6 @@ -895,7 +895,7 @@ cglobal deblock_v_chroma_intra_8, 4,5 movq m1, [t5+r1] movq m2, [r0] movq m3, [r0+r1] - call ff_chroma_intra_body_mmx2 + call ff_chroma_intra_body_mmxext movq [t5+r1], m1 movq [r0], m2 RET @@ -906,12 +906,12 @@ cglobal deblock_v_chroma_intra_8, 4,5 cglobal deblock_h_chroma_intra_8, 4,6 CHROMA_H_START TRANSPOSE4x8_LOAD bw, wd, dq, PASS8ROWS(t5, r0, r1, t6) - call ff_chroma_intra_body_mmx2 + call ff_chroma_intra_body_mmxext TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) RET ALIGN 16 -ff_chroma_intra_body_mmx2: +ff_chroma_intra_body_mmxext: LOAD_MASK r2d, r3d movq m5, m1 movq m6, m2 @@ -1035,7 +1035,7 @@ ff_chroma_intra_body_mmx2: jl %%.b_idx_loop %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext cglobal h264_loop_filter_strength, 9, 9, 0, bs, nnz, ref, mv, bidir, edges, \ step, mask_mv0, mask_mv1, field %define b_idxq bidirq |