diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-09 14:39:13 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-09 14:39:13 +0100 |
| commit | 881684e27cf68f04adcda4fa56c0ed9b69f9dc8b (patch) | |
| tree | 9833fcba965debd81799339b967af4ae90cf656a | |
| parent | 98c4268ecac1dfb5d3e534bbea684fc80e8aef17 (diff) | |
| download | ffmpeg-881684e27cf68f04adcda4fa56c0ed9b69f9dc8b.tar.gz | |
Add some fate dependencies to fix make fate with --disable-avdevice.
| -rw-r--r-- | tests/fate/avfilter.mak | 7 | ||||
| -rw-r--r-- | tests/fate/filter.mak | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index 8ac8d41bb1..d68757de87 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -12,7 +12,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-field \ fate-lavfi-idet \ fate-lavfi-il \ - fate-lavfi-life \ fate-lavfi-null \ fate-lavfi-overlay_rgb \ fate-lavfi-overlay_yuv420 \ @@ -28,11 +27,9 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-pixfmts_vflip \ fate-lavfi-scale200 \ fate-lavfi-scale500 \ - fate-lavfi-scalenorm \ fate-lavfi-select \ fate-lavfi-setdar \ fate-lavfi-setsar \ - fate-lavfi-testsrc \ fate-lavfi-thumbnail \ fate-lavfi-tile \ fate-lavfi-transpose \ @@ -41,6 +38,10 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-vflip_crop \ fate-lavfi-vflip_vflip \ +FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life \ + fate-lavfi-scalenorm \ + fate-lavfi-testsrc \ + FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-colormatrix1 \ fate-lavfi-colormatrix2 \ fate-lavfi-hue \ diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index e9742266fc..139ba38a0e 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -60,12 +60,12 @@ FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes) FILTER_METADATA_COMMAND = ffprobe$(EXESUF) -show_frames -of compact=nk=1:p=0 -bitexact -f lavfi SCENEDETECT_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER SELECT_FILTER SCALE_FILTER \ - AVCODEC MOV_DEMUXER SVQ3_DECODER ZLIB + AVCODEC AVDEVICE MOV_DEMUXER SVQ3_DECODER ZLIB FATE_METADATA_FILTER-$(call ALLYES, $(SCENEDETECT_DEPS)) += fate-filter-metadata-scenedetect fate-filter-metadata-scenedetect: SRC = $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov fate-filter-metadata-scenedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',select=gt(scene\,.4)" -SILENCEDETECT_DEPS = FFPROBE LAVFI_INDEV AMOVIE_FILTER AMR_DEMUXER AMRWB_DECODER +SILENCEDETECT_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER AMR_DEMUXER AMRWB_DECODER FATE_METADATA_FILTER-$(call ALLYES, $(SILENCEDETECT_DEPS)) += fate-filter-metadata-silencedetect fate-filter-metadata-silencedetect: SRC = $(SAMPLES)/amrwb/seed-12k65.awb fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',silencedetect=d=-20dB" |