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 /tests/fate | |
| 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 'tests/fate')
| -rw-r--r-- | tests/fate/filter.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 43e9fc48f2..721b8840aa 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -68,6 +68,9 @@ fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun FATE_FILTER_VSYNTH-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d +FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace +fate-filter-interlace: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace + #FATE_FILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav |