Merge commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a'
authorClément Bœsch <u@pkh.me>
Thu, 14 Jul 2016 17:33:20 +0000 (19:33 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 14 Jul 2016 17:35:04 +0000 (19:35 +0200)
* commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a':
  fate: Move Duck Truemotion 1 and 2 tests to vpx.mak

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
tests/fate/video.mak
tests/fate/vpx.mak

@@@ -90,36 -79,21 +90,24 @@@ fate-cvid-partial: CMD = framecrc -i $(
  FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale
  fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an
  
 -FATE_SAMPLES_AVCONV-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes)
 +FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes)
  fate-cvid: $(FATE_CVID-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, C93, C93) += fate-cyberia-c93
 +FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93
  fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CYUV) += fate-cyuv
 +FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv
  fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video
 +FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video
  fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm
 +FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm
  fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
  
- FATE_TRUEMOTION1 += fate-truemotion1-15
- fate-truemotion1-15: CMD = framecrc -i $(TARGET_SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 -an
- FATE_TRUEMOTION1 += fate-truemotion1-24
- fate-truemotion1-24: CMD = framecrc -i $(TARGET_SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an
- FATE_VIDEO-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1)
- fate-truemotion1: $(FATE_TRUEMOTION1)
- FATE_VIDEO-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2
- fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi
 +FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac
 +fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc
 +
  FATE_DXA += fate-dxa-feeble
  fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an
  
Simple merge