aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJames Almer2016-02-18 20:23:49 -0300
committerJames Almer2016-02-19 16:31:55 -0300
commit76af0c78772f1f7de6d3c317591f007c4e995203 (patch)
tree1c44108836f527895b8a06f7135d3a6e539b8883 /tests
parent7ac962af38f0f0adf6dcfb6716faee9729ef8036 (diff)
checkasm: fix dependencies for vf_blend tests
They will now compile if avcodec is disabled Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/checkasm/Makefile6
-rw-r--r--tests/checkasm/checkasm.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index bfd7c11387..c24e797a36 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -1,6 +1,5 @@
# libavcodec tests
AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o
-AVCODECOBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o
AVCODECOBJS-$(CONFIG_FLACDSP) += flacdsp.o
@@ -15,6 +14,11 @@ AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o
CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes)
+# libavfilter tests
+AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
+
+CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
+
-include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 1e73e34c76..fb8defd42a 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -68,9 +68,6 @@ static const struct {
#if CONFIG_ALAC_DECODER
{ "alacdsp", checkasm_check_alacdsp },
#endif
- #if CONFIG_BLEND_FILTER
- { "vf_blend", checkasm_check_blend },
- #endif
#if CONFIG_BSWAPDSP
{ "bswapdsp", checkasm_check_bswapdsp },
#endif
@@ -105,6 +102,11 @@ static const struct {
{ "videodsp", checkasm_check_videodsp },
#endif
#endif
+#if CONFIG_AVFILTER
+ #if CONFIG_BLEND_FILTER
+ { "vf_blend", checkasm_check_blend },
+ #endif
+#endif
{ NULL }
};