This fixes running FATE without --enable-gpl. --- tests/Makefile | 3 ++- tests/fate/filter.mak | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile index 0b11102..2ab529e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -81,7 +81,8 @@ FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) -FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV) +FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV) \ + $(FATE_SAMPLES_AVCONV-yes) FATE_SAMPLES += $(FATE_SAMPLES-yes) FATE += $(FATE-yes) diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 35b6558..911a0ba 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -18,8 +18,8 @@ $(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_SAMPLES_AVCONV += $(FATE_AMIX) +FATE_FILTER-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX) +FATE_SAMPLES_AVCONV-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX) FATE_ASYNCTS += fate-filter-asyncts fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv @@ -27,13 +27,13 @@ fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts fate-filter-asyncts: CMP = oneoff fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm -FATE_FILTER += $(FATE_ASYNCTS) -FATE_SAMPLES_AVCONV += $(FATE_ASYNCTS) +FATE_FILTER-$(CONFIG_ASYNCTS_FILTER) += $(FATE_ASYNCTS) +FATE_SAMPLES_AVCONV-$(CONFIG_ASYNCTS_FILTER) += $(FATE_ASYNCTS) 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_SAMPLES_AVCONV += fate-filter-delogo +FATE_FILTER-$(CONFIG_DELOGO_FILTER) += fate-filter-delogo +FATE_SAMPLES_AVCONV-$(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 @@ -41,7 +41,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_SAMPLES_AVCONV += $(FATE_YADIF) +FATE_FILTER-$(CONFIG_YADIF_FILTER) += $(FATE_YADIF) +FATE_SAMPLES_AVCONV-$(CONFIG_YADIF_FILTER) += $(FATE_YADIF) -fate-filter: $(FATE_FILTER) +fate-filter: $(FATE_FILTER-yes) -- 1.7.1 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
