Merge commit '7419b34825c20d52f667da2fbe4dc710ec8398f8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:24:04 +0000 (01:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:24:13 +0000 (01:24 +0100)
* commit '7419b34825c20d52f667da2fbe4dc710ec8398f8':
  fate: Add test for tscc2 in mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/screen.mak

@@@ -38,11 -38,17 +38,17 @@@ fate-tscc-15bit: CMD = framecrc -i $(TA
  FATE_TSCC += fate-tscc-32bit
  fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
 +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