diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 12:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 12:16:08 +0200 |
| commit | 3777e6b3bf65be9a925187a9d008c5d422fe17b5 (patch) | |
| tree | 6ab9a542129dd1bb6ac4ff6b572d714d1dba40c3 /tests/Makefile | |
| parent | 9317b73f11c34e550a2ffcf01540824dbaa36036 (diff) | |
| parent | b93e934aeea44f3e92f0acd960e5d10151f14379 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
fate: list lavfi tests in a makefile
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/Makefile b/tests/Makefile index 6d5df6623b..e358fbda25 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -57,6 +57,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak +include $(SRC_PATH)/tests/fate/avfilter.mak include $(SRC_PATH)/tests/fate/seek.mak include $(SRC_PATH)/tests/fate/aac.mak @@ -111,9 +112,6 @@ include $(SRC_PATH)/tests/fate/wavpack.mak include $(SRC_PATH)/tests/fate/wma.mak FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%) -FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%) - -FATE_AVCONV += $(FATE_LAVFI) \ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) @@ -132,13 +130,9 @@ $(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): $(FATE_FFPROBE): ffprobe$(EXESUF) -$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF) - $(FATE_LAVF_FATE): CMD = lavffatetest -$(FATE_LAVFI): CMD = lavfitest fate-lavf-fate: $(FATE_LAVF_FATE) -fate-lavfi: $(FATE_LAVFI) ifdef SAMPLES FATE += $(FATE_LAVF_FATE) |