diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 12:53:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-01 13:11:51 +0100 |
| commit | add7513e64e6db255e30fba544068ed2ab5e7b3e (patch) | |
| tree | 59bf00c7b1d6f75c5bc034500e3669cb76462396 /libavcodec/x86/h264_chromamc_10bit.asm | |
| parent | 14f1fa56b2aef1f4b2036ebdc7c6665ef68052c0 (diff) | |
| parent | fa8fcab1e0d31074c0644c4ac5194474c6c26415 (diff) | |
| download | ffmpeg-add7513e64e6db255e30fba544068ed2ab5e7b3e.tar.gz | |
Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
x86: h264_chromamc_10bit: drop pointless PAVG %define
x86: mmx2 ---> mmxext in function names
swscale: do not forget to swap data in formats with different endianness
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/gradfun.c
libswscale/input.c
libswscale/utils.c
libswscale/x86/swscale.c
tests/ref/lavfi/pixfmts_scale
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/x86/h264_chromamc_10bit.asm b/libavcodec/x86/h264_chromamc_10bit.asm index 4481efef7f..d24308d254 100644 --- a/libavcodec/x86/h264_chromamc_10bit.asm +++ b/libavcodec/x86/h264_chromamc_10bit.asm @@ -245,7 +245,7 @@ cglobal %1_h264_chroma_mc2_10, 6,7 %if %0==3 movq %2, %3 %endif - PAVG %1, %2 + pavgw %1, %2 %endmacro %define CHROMAMC_AVG NOTHING @@ -260,7 +260,6 @@ CHROMA_MC4 put CHROMA_MC2 put %define CHROMAMC_AVG AVG -%define PAVG pavgw INIT_XMM sse2 CHROMA_MC8 avg %if HAVE_AVX_EXTERNAL |