This conditionally enables the tests that depend on having zlib present. --- configure | 2 ++ tests/Makefile | 3 ++- tests/fate/lossless-video.mak | 4 ++-- tests/fate/qt.mak | 2 +- tests/fate/screen.mak | 4 ++-- tests/fate/vcodec.mak | 4 +++- tests/fate/video.mak | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/configure b/configure index a08b3af..a8bf357 100755 --- a/configure +++ b/configure @@ -1590,6 +1590,8 @@ test_deps(){ } mxf_d10_test_deps="avfilter" +png_test_deps="zlib" +seek_flashsv_flv_test_deps="zlib" seek_lavf_mxf_d10_test_deps="mxf_d10_test" test_deps _muxer _demuxer \ diff --git a/tests/Makefile b/tests/Makefile index 91f2d49..47bd1df 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -83,8 +83,9 @@ FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) +FATE_SAMPLES-$(CONFIG_AVCONV)-$(CONFIG_ZLIB) += $(FATE_SAMPLES_AVCONV_ZLIB) FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV) -FATE_SAMPLES += $(FATE_SAMPLES-yes) +FATE_SAMPLES += $(FATE_SAMPLES-yes) $(FATE_SAMPLES-yes-yes) FATE += $(FATE-yes) FATE += $(FATE_LIBAVUTIL) diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 4871296..e0ad8de 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -16,8 +16,8 @@ fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi FATE_SAMPLES_AVCONV += fate-vble fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi -FATE_SAMPLES_AVCONV += fate-zlib +FATE_SAMPLES_AVCONV_ZLIB += fate-zlib fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi -FATE_SAMPLES_AVCONV += fate-zerocodec +FATE_SAMPLES_AVCONV_ZLIB += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak index b2b9500..f65d3a3 100644 --- a/tests/fate/qt.mak +++ b/tests/fate/qt.mak @@ -46,5 +46,5 @@ fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 FATE_SAMPLES_AVCONV += fate-svq1 fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 -FATE_SAMPLES_AVCONV += fate-svq3 +FATE_SAMPLES_AVCONV_ZLIB += fate-svq3 fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 8ae7e90..9e43f0b 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -32,7 +32,7 @@ fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -FATE_SAMPLES_AVCONV += $(FATE_TSCC) +FATE_SAMPLES_AVCONV_ZLIB += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) FATE_VMNC += fate-vmnc-16bit @@ -56,5 +56,5 @@ fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 -FATE_SAMPLES_AVCONV += $(FATE_ZMBV) +FATE_SAMPLES_AVCONV_ZLIB += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index e9a9ad6..6fde72b 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -57,7 +57,7 @@ fate-vsynth%-ffv1: ENCOPTS = -strict -2 FATE_VCODEC += ffvhuff -FATE_VCODEC += flashsv +FATE_VCODEC-$(CONFIG_FLASHSV_ENCODER) += flashsv fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-flashsv: DECOPTS = -sws_flags area fate-vsynth%-flashsv: FMT = flv @@ -235,6 +235,8 @@ fate-vsynth%-wmv2: ENCOPTS = -qscale 10 FATE_VCODEC += yuv fate-vsynth%-yuv: CODEC = rawvideo +FATE_VCODEC += $(FATE_VCODEC-yes) + FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%) FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index e173c4a..1e0a182 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -46,7 +46,7 @@ fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fm FATE_SAMPLES_AVCONV += fate-cljr fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi -FATE_SAMPLES_AVCONV += fate-corepng +FATE_SAMPLES_AVCONV_ZLIB += fate-corepng fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi FATE_SAMPLES_AVCONV += fate-creatureshock-avs @@ -94,7 +94,7 @@ fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rg FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_DXA) +FATE_SAMPLES_AVCONV_ZLIB += $(FATE_DXA) fate-dxa: $(FATE_DXA) FATE_SAMPLES_AVCONV += fate-film-cvid -- 1.7.9.4 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel