From 7be9c0c10fc5f36b9a7dfaf2843ad588f3507e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Mon, 22 Oct 2012 07:56:00 +0200 Subject: [PATCH] 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_ lists are in the FATE_EXTERN list, which is only used when SAMPLES is set. --- tests/Makefile | 4 ++-- 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)