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/allfilters.c | |
| parent | 7e68491367ce60af078c0b53069a8011842bcd84 (diff) | |
| parent | 25882a7ff642e83f606071a568214c210b7b7ff1 (diff) | |
| download | ffmpeg-ebbd4fd5f06ac7a5c762fe3c8ee9684bf7fcf960.tar.gz | |
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/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 4c8f2b4a59..7e875f68e5 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -129,6 +129,7 @@ void avfilter_register_all(void) REGISTER_FILTER(HUE, hue, vf); REGISTER_FILTER(IDET, idet, vf); REGISTER_FILTER(IL, il, vf); + REGISTER_FILTER(INTERLACE, interlace, vf); REGISTER_FILTER(KERNDEINT, kerndeint, vf); REGISTER_FILTER(LUT, lut, vf); REGISTER_FILTER(LUTRGB, lutrgb, vf); |