diff options
| author | jamal <jamrial@gmail.com> | 2012-09-29 00:41:32 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-29 16:09:05 +0200 |
| commit | 062cd9acc129b46256e73900e8e49701e4bb00fd (patch) | |
| tree | 845d4d6f69ff90face5d8ea1d7a457922240c188 /tests/fate/vcodec.mak | |
| parent | 1bdb4b26a8324b8147c191607d65f1c15ef36446 (diff) | |
| download | ffmpeg-062cd9acc129b46256e73900e8e49701e4bb00fd.tar.gz | |
fate: Fix --disable-zlib
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vcodec.mak')
| -rw-r--r-- | tests/fate/vcodec.mak | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index d4c4cf60be..f4e39b8ce7 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -59,12 +59,12 @@ fate-vsynth%-ffv1: ENCOPTS = -strict -2 FATE_VCODEC += ffvhuff -FATE_VCODEC += flashsv +FATE_VCODEC-$(CONFIG_ZLIB) += flashsv fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-flashsv: DECOPTS = -sws_flags area fate-vsynth%-flashsv: FMT = flv -FATE_VCODEC += flashsv2 +FATE_VCODEC-$(CONFIG_ZLIB) += flashsv2 fate-vsynth%-flashsv2: ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0 fate-vsynth%-flashsv2: DECOPTS = -sws_flags area fate-vsynth%-flashsv2: FMT = flv @@ -193,7 +193,7 @@ fate-vsynth%-msmpeg4: ENCOPTS = -qscale 10 FATE_VCODEC += msmpeg4v2 fate-vsynth%-msmpeg4v2: ENCOPTS = -qscale 10 -FATE_VCODEC += mpng +FATE_VCODEC-$(CONFIG_ZLIB) += mpng fate-vsynth%-mpng: CODEC = png FATE_VCODEC += msvideo1 @@ -277,8 +277,9 @@ FATE_VCODEC += yuv4 FATE_VCODEC += y41p -FATE_VCODEC += zlib +FATE_VCODEC-$(CONFIG_ZLIB) += zlib +FATE_VCODEC += $(FATE_VCODEC-yes) FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%) FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%) |