diff options
author | Clément Bœsch <u@pkh.me> | 2016-07-14 19:33:20 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2016-07-14 19:35:04 +0200 |
commit | e28d66052dd3f9aab41631e229590df6819a5836 (patch) | |
tree | ed105ae37e9f67b30ea3530a81447384816c514e /tests | |
parent | bec7145252165249da9e1d447197cca120856057 (diff) | |
parent | 906ffed9b1b8b06979eb656989aecacb1ae75a3a (diff) | |
download | ffmpeg-e28d66052dd3f9aab41631e229590df6819a5836.tar.gz |
Merge commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a'
* commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a':
fate: Move Duck Truemotion 1 and 2 tests to vpx.mak
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/video.mak | 12 | ||||
-rw-r--r-- | tests/fate/vpx.mak | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 62acc261a9..eddf534796 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -108,18 +108,6 @@ fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1 FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc -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_DXA += fate-dxa-feeble fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 0212096e75..6a2512ff63 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,3 +1,15 @@ +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_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1) +fate-truemotion1: $(FATE_TRUEMOTION1) + +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2 +fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi + FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64 fate-theora-coeff-level64: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/coeff_level64.mkv |