[FFmpeg-devel] [PATCH] checkasm: fix dependencies for vf_blend tests

James Almer jamrial at gmail.com
Fri Feb 19 00:33:08 CET 2016


They will now compile if avcodec is disabled

Signed-off-by: James Almer <jamrial at gmail.com>
---
 tests/checkasm/Makefile   | 6 +++++-
 tests/checkasm/checkasm.c | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index bfd7c11..c24e797 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 1e73e34..fb8defd 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 }
 };
 
-- 
2.7.0



More information about the ffmpeg-devel mailing list