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_chromamc_10bit.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_chromamc_10bit.asm')
| -rw-r--r-- | libavcodec/x86/h264_chromamc_10bit.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/h264_chromamc_10bit.asm b/libavcodec/x86/h264_chromamc_10bit.asm index d24308d254..b850551781 100644 --- a/libavcodec/x86/h264_chromamc_10bit.asm +++ b/libavcodec/x86/h264_chromamc_10bit.asm @@ -255,7 +255,7 @@ CHROMA_MC8 put INIT_XMM avx CHROMA_MC8 put %endif -INIT_MMX mmx2 +INIT_MMX mmxext CHROMA_MC4 put CHROMA_MC2 put @@ -266,6 +266,6 @@ CHROMA_MC8 avg INIT_XMM avx CHROMA_MC8 avg %endif -INIT_MMX mmx2 +INIT_MMX mmxext CHROMA_MC4 avg CHROMA_MC2 avg |