diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:25:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:25:46 +0100 |
| commit | 7fd9d49ba7fa57629592b1f7064cb12d96984a14 (patch) | |
| tree | 5e28214b75e917193be3699941069c9bbb43ece4 /libavcodec/x86/h264_chromamc.asm | |
| parent | add7513e64e6db255e30fba544068ed2ab5e7b3e (diff) | |
| parent | 6b07830a77729fe25c30026feabd53e8c4c5eb9e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV
avconv_opt, cmdutils: Add missing function parameter Doxygen
x86: Move optimization suffix to end of function names
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_chromamc.asm')
| -rw-r--r-- | libavcodec/x86/h264_chromamc.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/x86/h264_chromamc.asm b/libavcodec/x86/h264_chromamc.asm index f0cfb1e879..38cf15f711 100644 --- a/libavcodec/x86/h264_chromamc.asm +++ b/libavcodec/x86/h264_chromamc.asm @@ -437,8 +437,8 @@ cglobal %1_%2_chroma_mc2_%3, 6, 7, 0 INIT_MMX %define CHROMAMC_AVG NOTHING %define CHROMAMC_AVG4 NOTHING -chroma_mc8_mmx_func put, h264, mmx_rnd -chroma_mc8_mmx_func put, vc1, mmx_nornd +chroma_mc8_mmx_func put, h264, rnd_mmx +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 @@ -447,16 +447,16 @@ chroma_mc2_mmx_func put, h264, mmx2 %define CHROMAMC_AVG DIRECT_AVG %define CHROMAMC_AVG4 COPY_AVG %define PAVG pavgb -chroma_mc8_mmx_func avg, h264, mmx2_rnd -chroma_mc8_mmx_func avg, vc1, mmx2_nornd +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 %define PAVG pavgusb -chroma_mc8_mmx_func avg, h264, 3dnow_rnd -chroma_mc8_mmx_func avg, vc1, 3dnow_nornd +chroma_mc8_mmx_func avg, h264, rnd_3dnow +chroma_mc8_mmx_func avg, vc1, nornd_3dnow chroma_mc8_mmx_func avg, rv40, 3dnow chroma_mc4_mmx_func avg, h264, 3dnow chroma_mc4_mmx_func avg, rv40, 3dnow @@ -664,15 +664,15 @@ cglobal %1_%2_chroma_mc4_%3, 6, 7, 0 %define CHROMAMC_AVG NOTHING INIT_XMM -chroma_mc8_ssse3_func put, h264, ssse3_rnd -chroma_mc8_ssse3_func put, vc1, ssse3_nornd +chroma_mc8_ssse3_func put, h264, rnd_ssse3 +chroma_mc8_ssse3_func put, vc1, nornd_ssse3 INIT_MMX chroma_mc4_ssse3_func put, h264, ssse3 %define CHROMAMC_AVG DIRECT_AVG %define PAVG pavgb INIT_XMM -chroma_mc8_ssse3_func avg, h264, ssse3_rnd -chroma_mc8_ssse3_func avg, vc1, ssse3_nornd +chroma_mc8_ssse3_func avg, h264, rnd_ssse3 +chroma_mc8_ssse3_func avg, vc1, nornd_ssse3 INIT_MMX chroma_mc4_ssse3_func avg, h264, ssse3 |