History

use a Makefile in x86 subdir

Originally committed as revision 25234 to svn://svn.ffmpeg.org/ffmpeg/trunk

Aurelien Jacobs committed 16 years ago

Commit fa6f4eb1 parent 236f7943 files · +3 −6Browse files

Unified · Split

3 files
  1. libavfilter/Makefile +2 −2
  2. libavfilter/x86/Makefile +1 −0
  3. libavfilter/x86/yadif.c +0 −4
libavfilter/Makefile+2−2
@@ -39,14 +39,14 @@ OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o · 38 unmodified lines
3939 OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
4040 OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o
4141
42−OBJS-$(ARCH_X86) += x86/yadif.o
43−
4442 OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o
4543 OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o
4644 OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
4745
4846 OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
4947
48+-include $(SUBDIR)$(ARCH)/Makefile
49+
5050 DIRS = x86
5151
5252 include $(SUBDIR)../subdir.mak
libavfilter/x86/Makefile+1−0
@@ -0,0 +1 @@
1+MMX-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o
libavfilter/x86/yadif.c+0−4
@@ -22,8 +22,6 @@ · 21 unmodified lines
2222 #include "libavutil/x86_cpu.h"
2323 #include "libavfilter/yadif.h"
2424
25−#if HAVE_MMX
26−
2725 #define LOAD4(mem,dst) \
2826 "movd "mem", "#dst" \n\t"\
2927 "punpcklbw %%mm7, "#dst" \n\t"
@@ -236,5 +234,3 @@ void ff_yadif_filter_line_mmx(uint8_t *dst, · 206 unmodified lines
236234 #undef CHECK1
237235 #undef CHECK2
238236 #undef FILTER
239−
240−#endif /* HAVE_MMX */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t