diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 16:26:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 16:32:33 +0200 |
| commit | ebbd4fd5f06ac7a5c762fe3c8ee9684bf7fcf960 (patch) | |
| tree | 0e94f037689c704b979633553616a7fa9558e453 /libavfilter/Makefile | |
| parent | 7e68491367ce60af078c0b53069a8011842bcd84 (diff) | |
| parent | 25882a7ff642e83f606071a568214c210b7b7ff1 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a test for the interlace filter
lavfi: new interlace filter
Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c736ad1205..c3cd753557 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -131,6 +131,7 @@ OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o OBJS-$(CONFIG_IL_FILTER) += vf_il.o +OBJS-$(CONFIG_INTERLACE_FILTER) += vf_interlace.o OBJS-$(CONFIG_KERNDEINT_FILTER) += vf_kerndeint.o OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o |