summaryrefslogtreecommitdiff
path: root/tests/fate/screen.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-24 01:24:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-24 01:24:13 +0100
commitcceb737936e69e851977e8471da37d6777ed5a20 (patch)
tree694fd546f36b23ad515d3e1c0a6b7907335bb92e /tests/fate/screen.mak
parentdfea1acb21f3a3945d04537855ab6412c2b4e323 (diff)
parent7419b34825c20d52f667da2fbe4dc710ec8398f8 (diff)
Merge commit '7419b34825c20d52f667da2fbe4dc710ec8398f8'
* commit '7419b34825c20d52f667da2fbe4dc710ec8398f8': fate: Add test for tscc2 in mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/screen.mak')
-rw-r--r--tests/fate/screen.mak10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index c66cd958a8..9142d497db 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -41,8 +41,14 @@ fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-par
FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
fate-tscc: $(FATE_TSCC)
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC2) += fate-tscc2
-fate-tscc2: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/tsc2_16bpp.avi
+FATE_TSCC2-$(CONFIG_AVI_DEMUXER) += fate-tscc2-avi
+fate-tscc2-avi: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/tsc2_16bpp.avi
+
+FATE_TSCC2-$(CONFIG_MOV_DEMUXER) += fate-tscc2-mov
+fate-tscc2-mov: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/rec.trec
+
+FATE_SAMPLES_AVCONV-$(CONFIG_TSCC2_DECODER) += $(FATE_TSCC2-yes)
+fate-tscc2: $(FATE_TSCC2-yes)
FATE_VMNC += fate-vmnc-16bit
fate-vmnc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/test.avi -pix_fmt rgb24