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_weight.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_weight.asm')
| -rw-r--r-- | libavcodec/x86/h264_weight.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm index b41d44d88a..b23e804dcf 100644 --- a/libavcodec/x86/h264_weight.asm +++ b/libavcodec/x86/h264_weight.asm @@ -71,7 +71,7 @@ SECTION .text %endmacro INIT_MMX -cglobal h264_weight_16_mmx2, 6, 6, 0 +cglobal h264_weight_16_mmxext, 6, 6, 0 WEIGHT_SETUP .nextrow: WEIGHT_OP 0, 4 @@ -96,7 +96,7 @@ cglobal h264_weight_%1_%3, 6, 6, %2 %endmacro INIT_MMX -WEIGHT_FUNC_MM 8, 0, mmx2 +WEIGHT_FUNC_MM 8, 0, mmxext INIT_XMM WEIGHT_FUNC_MM 16, 8, sse2 @@ -121,7 +121,7 @@ cglobal h264_weight_%1_%3, 6, 6, %2 %endmacro INIT_MMX -WEIGHT_FUNC_HALF_MM 4, 0, mmx2 +WEIGHT_FUNC_HALF_MM 4, 0, mmxext INIT_XMM WEIGHT_FUNC_HALF_MM 8, 8, sse2 @@ -175,7 +175,7 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2 %endmacro INIT_MMX -cglobal h264_biweight_16_mmx2, 7, 8, 0 +cglobal h264_biweight_16_mmxext, 7, 8, 0 BIWEIGHT_SETUP movifnidn r3d, r3m .nextrow: @@ -210,7 +210,7 @@ cglobal h264_biweight_%1_%3, 7, 8, %2 %endmacro INIT_MMX -BIWEIGHT_FUNC_MM 8, 0, mmx2 +BIWEIGHT_FUNC_MM 8, 0, mmxext INIT_XMM BIWEIGHT_FUNC_MM 16, 8, sse2 @@ -239,7 +239,7 @@ cglobal h264_biweight_%1_%3, 7, 8, %2 %endmacro INIT_MMX -BIWEIGHT_FUNC_HALF_MM 4, 0, mmx2 +BIWEIGHT_FUNC_HALF_MM 4, 0, mmxext INIT_XMM BIWEIGHT_FUNC_HALF_MM 8, 8, sse2 |