diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-10-22 07:56:00 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-10-22 23:13:53 +0200 |
| commit | 7be9c0c10fc5f36b9a7dfaf2843ad588f3507e5a (patch) | |
| tree | 5cd965275c975160a75f57f27e161316eaa22de9 | |
| parent | 0de41ead6f9034e0a834abe51028a02aee094990 (diff) | |
| download | ffmpeg-7be9c0c10fc5f36b9a7dfaf2843ad588f3507e5a.tar.gz | |
fate: fix SAMPLES dependency for ffprobe.
FATE_SAMPLES_FFPROBE is a different list than FATE_FFPROBE, the same way
FATE_SAMPLES_FFMPEG is a different list than FATE_FFMPEG; these
FATE_SAMPLES_<tool> lists are in the FATE_EXTERN list, which is only
used when SAMPLES is set.
| -rw-r--r-- | tests/Makefile | 4 | ||||
| -rw-r--r-- | tests/fate/filter.mak | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile index bc18cb58a4..8e22fbfba4 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -122,7 +122,7 @@ FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes) -FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) +FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE) FATE_EXTERN += $(FATE_EXTERN-yes) FATE += $(FATE-yes) @@ -130,7 +130,7 @@ FATE += $(FATE_LIBAVUTIL) $(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) -$(FATE_FFPROBE): ffprobe$(EXESUF) +$(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF) ifdef SAMPLES FATE += $(FATE_FULL) $(FATE_FULL-yes) diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 4644ede847..314b732681 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -59,6 +59,6 @@ FATE_METADATA_FILTER-$(call ALLYES, FFPROBE LAVFI_INDEV AMOVIE_FILTER AMR_DEMUXE fate-filter-metadata-silencedetect: SRC = $(SAMPLES)/amrwb/seed-12k65.awb fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie=$(SRC),silencedetect=d=.1" -FATE_FFPROBE += $(FATE_METADATA_FILTER-yes) +FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes) fate-filter: $(FATE_FILTER-yes) $(FATE_METADATA_FILTER-yes) |