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/mpegvideoenc.c | |
| 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/mpegvideoenc.c')
| -rw-r--r-- | libavcodec/x86/mpegvideoenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index ee2b25f81e..8e711f633b 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -47,8 +47,8 @@ extern uint16_t ff_inv_zigzag_direct16[64]; #define COMPILE_TEMPLATE_SSSE3 0 #undef RENAME #undef RENAMEl -#define RENAME(a) a ## _MMX2 -#define RENAMEl(a) a ## _mmx2 +#define RENAME(a) a ## _MMXEXT +#define RENAMEl(a) a ## _mmxext #include "mpegvideoenc_template.c" #endif /* HAVE_MMXEXT_INLINE */ @@ -92,7 +92,7 @@ void ff_dct_encode_init_x86(MpegEncContext *s) #endif #if HAVE_MMXEXT_INLINE if (INLINE_MMXEXT(mm_flags)) - s->dct_quantize = dct_quantize_MMX2; + s->dct_quantize = dct_quantize_MMXEXT; #endif #if HAVE_SSE2_INLINE if (INLINE_SSE2(mm_flags)) |