diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 02:28:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 02:39:49 +0100 |
| commit | 6f373d75e8923ceb0c6b248b55f65f06dcf69101 (patch) | |
| tree | 6b05292005d71a7f9bb41c965ff76794753cfd81 /libavfilter/x86/Makefile | |
| parent | 53ab7846eeb6cf91bd33dc17598bd5a66b8e3497 (diff) | |
| parent | 2e1704059ae8625beda2ffde847ad22c5ba416dc (diff) | |
| download | ffmpeg-streaming-6f373d75e8923ceb0c6b248b55f65f06dcf69101.zip ffmpeg-streaming-6f373d75e8923ceb0c6b248b55f65f06dcf69101.tar.gz | |
Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'
* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
vf_interlace: Add SIMD for lowpass filter
Conflicts:
libavfilter/vf_interlace.c
libavfilter/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86/Makefile')
| -rw-r--r-- | libavfilter/x86/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile index 32145db..ef2d0e9 100644 --- a/libavfilter/x86/Makefile +++ b/libavfilter/x86/Makefile @@ -1,6 +1,7 @@ OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun_init.o OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d_init.o OBJS-$(CONFIG_IDET_FILTER) += x86/vf_idet_init.o +OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace_init.o OBJS-$(CONFIG_NOISE_FILTER) += x86/vf_noise.o OBJS-$(CONFIG_PULLUP_FILTER) += x86/vf_pullup_init.o OBJS-$(CONFIG_SPP_FILTER) += x86/vf_spp.o @@ -10,6 +11,7 @@ OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o YASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o YASM-OBJS-$(CONFIG_IDET_FILTER) += x86/vf_idet.o +YASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o YASM-OBJS-$(CONFIG_PULLUP_FILTER) += x86/vf_pullup.o YASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o YASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o x86/yadif-16.o x86/yadif-10.o |
