Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o · 38 unmodified lines | |||
| 39 | OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o | 39 | OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o |
| 40 | OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o | 40 | OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o |
| 41 | 41 | ||
| 42 | OBJS-$(ARCH_X86) += x86/yadif.o | ||
| 43 | |||
| 44 | OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o | 42 | OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o |
| 45 | OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o | 43 | OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o |
| 46 | OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o | 44 | OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o |
| 47 | 45 | ||
| 48 | OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o | 46 | OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o |
| 49 | 47 | ||
| 48 | -include $(SUBDIR)$(ARCH)/Makefile | ||
| 49 | |||
| 50 | DIRS = x86 | 50 | DIRS = x86 |
| 51 | 51 | ||
| 52 | include $(SUBDIR)../subdir.mak | 52 | include $(SUBDIR)../subdir.mak |
| @@ -0,0 +1 @@ | |||
| 1 | MMX-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o | ||
| @@ -22,8 +22,6 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/x86_cpu.h" | 22 | #include "libavutil/x86_cpu.h" |
| 23 | #include "libavfilter/yadif.h" | 23 | #include "libavfilter/yadif.h" |
| 24 | 24 | ||
| 25 | #if HAVE_MMX | ||
| 26 | |||
| 27 | #define LOAD4(mem,dst) \ | 25 | #define LOAD4(mem,dst) \ |
| 28 | "movd "mem", "#dst" \n\t"\ | 26 | "movd "mem", "#dst" \n\t"\ |
| 29 | "punpcklbw %%mm7, "#dst" \n\t" | 27 | "punpcklbw %%mm7, "#dst" \n\t" |
| @@ -236,5 +234,3 @@ void ff_yadif_filter_line_mmx(uint8_t *dst, · 206 unmodified lines | |||
| 236 | #undef CHECK1 | 234 | #undef CHECK1 |
| 237 | #undef CHECK2 | 235 | #undef CHECK2 |
| 238 | #undef FILTER | 236 | #undef FILTER |
| 239 | |||
| 240 | #endif /* HAVE_MMX */ | ||