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.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_chromamc.asm')
| -rw-r--r-- | libavcodec/x86/h264_chromamc.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm index 38cf15f711..ee6c4123dd 100644 --- a/libavcodec/x86/h264_chromamc.asm +++ b/libavcodec/x86/h264_chromamc.asm @@ -442,17 +442,17 @@ chroma_mc8_mmx_func put, vc1, nornd_mmx chroma_mc8_mmx_func put, rv40, mmx chroma_mc4_mmx_func put, h264, mmx chroma_mc4_mmx_func put, rv40, mmx -chroma_mc2_mmx_func put, h264, mmx2 +chroma_mc2_mmx_func put, h264, mmxext %define CHROMAMC_AVG DIRECT_AVG %define CHROMAMC_AVG4 COPY_AVG %define PAVG pavgb -chroma_mc8_mmx_func avg, h264, rnd_mmx2 -chroma_mc8_mmx_func avg, vc1, nornd_mmx2 -chroma_mc8_mmx_func avg, rv40, mmx2 -chroma_mc4_mmx_func avg, h264, mmx2 -chroma_mc4_mmx_func avg, rv40, mmx2 -chroma_mc2_mmx_func avg, h264, mmx2 +chroma_mc8_mmx_func avg, h264, rnd_mmxext +chroma_mc8_mmx_func avg, vc1, nornd_mmxext +chroma_mc8_mmx_func avg, rv40, mmxext +chroma_mc4_mmx_func avg, h264, mmxext +chroma_mc4_mmx_func avg, rv40, mmxext +chroma_mc2_mmx_func avg, h264, mmxext %define PAVG pavgusb chroma_mc8_mmx_func avg, h264, rnd_3dnow |