aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-05-19 22:56:01 +0100
committerMans Rullgard <mans@mansr.com>2012-05-20 12:54:31 +0100
commit4852cb37ce25e9251bb526ff75afdb90f16812c9 (patch)
tree3df3c0bca1911dc10ca1fd7919b3869c1d433cbf
parentcf61aaaca16810b9b3a28395ed48fda8db0e87d9 (diff)
downloadffmpeg-4852cb37ce25e9251bb526ff75afdb90f16812c9.tar.gz
fate: fix dependencies for non-SAMPLES avconv tests
The encode/decode tests should all depend on avconv. Since avconv requires libavfilter, there is no need to enable those tests selectively. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--tests/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 55e8867d4e..79316b8d11 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -74,16 +74,16 @@ FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%)
FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%)
FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%)
-FATE = $(FATE_ACODEC) \
- $(FATE_VCODEC) \
- $(FATE_LAVF) \
- $(FATE_SEEK) \
+FATE_AVCONV += $(FATE_ACODEC) \
+ $(FATE_VCODEC) \
+ $(FATE_LAVF) \
+ $(FATE_LAVFI) \
+ $(FATE_SEEK) \
FATE_AVCONV += $(FATE_AVCONV-yes)
FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC)
-FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI)
FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
FATE_SAMPLES += $(FATE_SAMPLES-yes)