[FFmpeg-cvslog] fate: Only test enabled filters
Diego Biurrun
git at videolan.org
Sun Aug 12 13:48:49 CEST 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Aug 2 00:35:42 2012 +0200| [e017c8755266cda802652ba553f018747759b294] | committer: Diego Biurrun
fate: Only test enabled filters
This fixes running FATE without --enable-gpl.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e017c8755266cda802652ba553f018747759b294
---
tests/fate/filter.mak | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak
index e42f837..f16aee1 100644
--- a/tests/fate/filter.mak
+++ b/tests/fate/filter.mak
@@ -18,9 +18,9 @@ $(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav
$(FATE_AMIX): CMP = oneoff
$(FATE_AMIX): CMP_UNIT = f32
-FATE_FILTER += $(FATE_AMIX)
+FATE_FILTER-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX)
-FATE_FILTER += fate-filter-asyncts
+FATE_FILTER-$(CONFIG_ASYNCTS_FILTER) += fate-filter-asyncts
fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv
fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts
fate-filter-asyncts: CMP = oneoff
@@ -28,7 +28,7 @@ fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an
-FATE_FILTER += fate-filter-delogo
+FATE_FILTER-$(CONFIG_DELOGO_FILTER) += fate-filter-delogo
FATE_YADIF += fate-filter-yadif-mode0
fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0
@@ -36,7 +36,7 @@ fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLE
FATE_YADIF += fate-filter-yadif-mode1
fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
-FATE_FILTER += $(FATE_YADIF)
+FATE_FILTER-$(CONFIG_YADIF_FILTER) += $(FATE_YADIF)
-FATE_SAMPLES_AVCONV += $(FATE_FILTER)
-fate-filter: $(FATE_FILTER)
+FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes)
+fate-filter: $(FATE_FILTER-yes)
More information about the ffmpeg-cvslog
mailing list