Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / fate / vpx.mak

diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 87b11cc23f3a8e7b25a1ba3e2708bed81588c083..d3f9cc79ae798a715feafa75353db3dcfe3ef98b 100644 (file)
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -1,27 +1,30 @@
-FATE_TESTS += fate-ea-vp60
-fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
-
-FATE_TESTS += fate-ea-vp61
-fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
-
 FATE_VP3 += fate-vp31
 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
 
 FATE_VP3 += fate-vp3-coeff-level64
 fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv
 
-FATE_TESTS += $(FATE_VP3)
+FATE_SAMPLES_AVCONV += $(FATE_VP3)
 fate-vp3: $(FATE_VP3)
 
-FATE_TESTS += fate-vp5
+FATE_SAMPLES_AVCONV += fate-vp5
 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
 
-FATE_TESTS += fate-vp6a
+FATE_VP6 += fate-vp60
+fate-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
+
+FATE_VP6 += fate-vp61
+fate-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
+
+FATE_VP6 += fate-vp6a
 fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
 
-FATE_TESTS += fate-vp6f
+FATE_VP6 += fate-vp6f
 fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv
 
+FATE_SAMPLES_AVCONV += $(FATE_VP6)
+fate-vp6: $(FATE_VP6)
+
 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
 
 define FATE_VP8_SUITE
@@ -34,7 +37,7 @@ define FATE_VP8_FULL
 $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
 
 # FIXME this file contains two frames with identical timestamps,
-# so avconv drops one of them
+# so ffmpeg drops one of them
 FATE_VP8 += fate-vp8-sign-bias$(1)
 fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf
 fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
@@ -46,5 +49,5 @@ endef
 
 $(eval $(call FATE_VP8_FULL))
 $(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge))
-FATE_TESTS += $(FATE_VP8)
+FATE_SAMPLES_AVCONV += $(FATE_VP8)
 fate-vp8: $(FATE_VP8)