Merge commit '7419b34825c20d52f667da2fbe4dc710ec8398f8'

* commit '7419b34825c20d52f667da2fbe4dc710ec8398f8':
  fate: Add test for tscc2 in mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

tests/ref/fate/tscc2-mov

@@ -0,0 +1,16 @@
+#tb 0: 1/5
+0,          0,          0,        1,  1180116, 0x01d01336
+0,          1,          1,        1,  1180116, 0x01d01336
+0,          2,          2,        1,  1180116, 0x01d01336
+0,          3,          3,        1,  1180116, 0x01d01336
+0,          4,          4,        1,  1180116, 0x01d01336
+0,          5,          5,        1,  1180116, 0x01d01336
+0,          6,          6,        1,  1180116, 0x01d01336
+0,          7,          7,        1,  1180116, 0x01d01336
+0,          8,          8,        1,  1180116, 0x01d01336
+0,          9,          9,        1,  1180116, 0x01d01336
+0,         10,         10,        1,  1180116, 0x056fdadd
+0,         11,         11,        1,  1180116, 0x6f73e080
+0,         12,         12,        1,  1180116, 0x5244d9e5
+0,         13,         13,        1,  1180116, 0x629bf10f
+0,         14,         14,        1,  1180116, 0x97c726cb