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/screen.mak | |
| parent | 1bdb4b26a8324b8147c191607d65f1c15ef36446 (diff) | |
fate: Fix --disable-zlib
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/screen.mak')
| -rw-r--r-- | tests/fate/screen.mak | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index eb7bafe9c3..14264a6547 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_SCREEN += $(FATE_TSCC) +FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) FATE_VMNC += fate-vmnc-16bit @@ -56,8 +56,10 @@ 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_SCREEN += $(FATE_ZMBV) +FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) +FATE_SCREEN += $(FATE_SCREEN-yes) + FATE_SAMPLES_FFMPEG += $(FATE_SCREEN) fate-screen: $(FATE_SCREEN) |