ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Thu Jul 14 19:33:20 2016 +0200| [e28d66052dd3f9aab41631e229590df6819a5836] | committer: Clément Bœsch
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> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e28d66052dd3f9aab41631e229590df6819a5836 --- tests/fate/video.mak | 12 ------------ 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 62acc26..eddf534 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 0212096..6a2512f 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 ====================================================================== diff --cc tests/fate/video.mak index 62acc26,18366e8..eddf534 --- a/tests/fate/video.mak +++ b/tests/fate/video.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_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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
