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 /libavfilter | |
| 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 'libavfilter')
| -rw-r--r-- | libavfilter/x86/gradfun.c | 6 | ||||
| -rw-r--r-- | libavfilter/x86/yadif.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c index 6faf7d1230..5e71aabd68 100644 --- a/libavfilter/x86/gradfun.c +++ b/libavfilter/x86/gradfun.c @@ -30,7 +30,9 @@ DECLARE_ALIGNED(16, static const uint16_t, pw_7f)[8] = {0x7F,0x7F,0x7F,0x7F,0x7F DECLARE_ALIGNED(16, static const uint16_t, pw_ff)[8] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; #if HAVE_MMXEXT_INLINE -static void gradfun_filter_line_mmx2(uint8_t *dst, const uint8_t *src, const uint16_t *dc, int width, int thresh, const uint16_t *dithers) +static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src, const uint16_t *dc, + int width, int thresh, + const uint16_t *dithers) { intptr_t x; if (width & 3) { @@ -175,7 +177,7 @@ av_cold void ff_gradfun_init_x86(GradFunContext *gf) #if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) - gf->filter_line = gradfun_filter_line_mmx2; + gf->filter_line = gradfun_filter_line_mmxext; #endif #if HAVE_SSSE3_INLINE if (cpu_flags & AV_CPU_FLAG_SSSE3) diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index 881be5a934..b48a3d6f76 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -48,7 +48,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 #if HAVE_MMXEXT_INLINE #undef RENAME -#define RENAME(a) a ## _mmx2 +#define RENAME(a) a ## _mmxext #include "yadif_template.c" #endif @@ -60,7 +60,7 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) #if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) - yadif->filter_line = yadif_filter_line_mmx2; + yadif->filter_line = yadif_filter_line_mmxext; #endif #if HAVE_SSE2_INLINE if (cpu_flags & AV_CPU_FLAG_SSE2) |