diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 18:26:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 18:32:33 +0400 |
| commit | ebbd4fd5f06ac7a5c762fe3c8ee9684bf7fcf960 (patch) | |
| tree | 0e94f037689c704b979633553616a7fa9558e453 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2133,6 +2133,7 @@ geq_filter_deps="gpl" histeq_filter_deps="gpl" hqdn3d_filter_deps="gpl" hue_filter_deps="gpl" +interlace_filter_deps="gpl" kerndeint_filter_deps="gpl" movie_filter_deps="avcodec avformat" mp_filter_deps="gpl avcodec swscale inline_asm" |