diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
| commit | d1dad7c824c14939a0e18fa262f3e51957de6e3e (patch) | |
| tree | 615f6ba80611f53e520d2ae479d9d4409077a78d /libavfilter | |
| parent | d2ca5dd0f33b0fdbb5d2a7429c8f71ff1dffffb7 (diff) | |
| parent | f2ed006c90ccb65cd143d8b0fcfc28ffb98c4289 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpc8: return more meaningful error codes.
mpc: return more meaningful error codes.
wv,mpc8: don't return apetag data in packets.
rtmp: do not warn about receiving metadata packets
x86: h264dsp: Adjust YASM #ifdefs
x86: yadif: Mark mmxext optimizations as such
h264: convert loop filter strength dsp function to yasm.
Improve descriptiveness of a number of codec and container long names
Conflicts:
libavcodec/flvdec.c
libavcodec/libopenjpegdec.c
libavformat/apetag.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/x86/yadif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index 57b1a087c3..68aa249ccb 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -45,9 +45,9 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 #undef COMPILE_TEMPLATE_SSE #endif -#if HAVE_MMX +#if HAVE_MMX2 #undef RENAME -#define RENAME(a) a ## _mmx +#define RENAME(a) a ## _mmx2 #include "yadif_template.c" #endif @@ -58,9 +58,9 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) int cpu_flags = av_get_cpu_flags(); #if HAVE_INLINE_ASM -#if HAVE_MMX - if (cpu_flags & AV_CPU_FLAG_MMX) - yadif->filter_line = yadif_filter_line_mmx; +#if HAVE_MMX2 + if (cpu_flags & AV_CPU_FLAG_MMX2) + yadif->filter_line = yadif_filter_line_mmx2; #endif #if HAVE_SSE if (cpu_flags & AV_CPU_FLAG_SSE2) |