---
 tests/Makefile           |    1 +
 tests/fate.mak           |    6 ------
 tests/fate/microsoft.mak |   18 ++++++++++++++++++
 tests/fate2.mak          |   10 ----------
 4 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 tests/fate/microsoft.mak

diff --git a/tests/Makefile b/tests/Makefile
index ee386c5..c251962 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -41,6 +41,7 @@ include $(SRC_PATH)/tests/fate/image.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
+include $(SRC_PATH)/tests/fate/microsoft.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
 include $(SRC_PATH)/tests/fate/pcm.mak
 include $(SRC_PATH)/tests/fate/prores.mak
diff --git a/tests/fate.mak b/tests/fate.mak
index 711f13a..394db4d 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -34,10 +34,6 @@ FATE_TESTS += fate-mpc7-demux
 fate-mpc7-demux: CMD = crc  -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
 FATE_TESTS += fate-mpc8-demux
 fate-mpc8-demux: CMD = crc  -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
-FATE_TESTS += fate-msvideo1-16bit
-fate-msvideo1-16bit: CMD = framecrc  -i $(SAMPLES)/cram/clock-cram16.avi 
-pix_fmt rgb24
-FATE_TESTS += fate-msvideo1-8bit
-fate-msvideo1-8bit: CMD = framecrc  -i $(SAMPLES)/cram/skating.avi -t 1 
-pix_fmt rgb24
 FATE_TESTS += fate-nuv
 fate-nuv: CMD = framecrc  -idct simple -i $(SAMPLES)/nuv/Today.nuv -vsync 0
 FATE_TESTS += fate-qpeg
@@ -52,8 +48,6 @@ FATE_TESTS += fate-ulti
 fate-ulti: CMD = framecrc  -i $(SAMPLES)/ulti/hit12w.avi -an
 FATE_TESTS += fate-v210
 fate-v210: CMD = framecrc  -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt 
yuv422p16be -an
-FATE_TESTS += fate-vc1
-fate-vc1: CMD = framecrc  -i $(SAMPLES)/vc1/SA00040.vc1
 FATE_TESTS += fate-vcr1
 fate-vcr1: CMD = framecrc  -i $(SAMPLES)/vcr1/VCR1test.avi -an
 FATE_TESTS += fate-video-xl
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
new file mode 100644
index 0000000..c6c1c62
--- /dev/null
+++ b/tests/fate/microsoft.mak
@@ -0,0 +1,18 @@
+FATE_TESTS += fate-msmpeg4v1
+fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i 
$(SAMPLES)/msmpeg4v1/mpg4.avi -an
+
+FATE_TESTS += fate-msvideo1-16bit
+fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi 
-pix_fmt rgb24
+
+FATE_TESTS += fate-msvideo1-8bit
+fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 
-pix_fmt rgb24
+
+FATE_TESTS += fate-wmv8-drm
+# discard last packet to avoid fails due to overread of VC-1 decoder
+fate-wmv8-drm: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an 
-vframes 162
+
+FATE_TESTS += fate-wmv8-drm-nodec
+fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec 
copy -vcodec copy
+
+FATE_TESTS += fate-vc1
+fate-vc1: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
diff --git a/tests/fate2.mak b/tests/fate2.mak
index 2af11e4..af94602 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -16,19 +16,9 @@ fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
 fate-dts: CMP = oneoff
 fate-dts: REF = $(SAMPLES)/dts/dts.pcm
 
-FATE_TESTS += fate-msmpeg4v1
-fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i 
$(SAMPLES)/msmpeg4v1/mpg4.avi -an
-
 FATE_TESTS += fate-ansi
 fate-ansi: CMD = framecrc -chars_per_frame 44100 -i 
$(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
 
-FATE_TESTS += fate-wmv8-drm
-# discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv8-drm: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an 
-vframes 162
-
-FATE_TESTS += fate-wmv8-drm-nodec
-fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec 
copy -vcodec copy
-
 FATE_TESTS += fate-mjpegb
 fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i 
$(SAMPLES)/mjpegb/mjpegb_part.mov -an
 
-- 
1.7.1

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to