---
 tests/Makefile  |    1 -
 tests/fate.mak  |   19 +++++++++++++++++++
 tests/fate2.mak |   18 ------------------
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 tests/fate2.mak

diff --git a/tests/Makefile b/tests/Makefile
index 917e312..2d97cae 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -24,7 +24,6 @@ tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF)
 tests/data/asynth%.sw tests/vsynth%/00.pgm: TAG = GEN
 
 include $(SRC_PATH)/tests/fate.mak
-include $(SRC_PATH)/tests/fate2.mak
 
 include $(SRC_PATH)/tests/fate/aac.mak
 include $(SRC_PATH)/tests/fate/ac3.mak
diff --git a/tests/fate.mak b/tests/fate.mak
index dfb2497..c6b62d2 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -4,6 +4,9 @@ fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI 
-pix_fmt rgb24
 FATE_TESTS += fate-amv
 fate-amv: CMD = framecrc -idct simple -i 
$(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10
 
+FATE_TESTS += fate-ansi
+fate-ansi: CMD = framecrc -chars_per_frame 44100 -i 
$(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
+
 FATE_TESTS += fate-auravision
 fate-auravision: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
 
@@ -31,12 +34,28 @@ fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi
 FATE_TESTS += fate-deluxepaint-anm
 fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM 
-pix_fmt rgb24
 
+FATE_TESTS += fate-dts
+fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
+fate-dts: CMP = oneoff
+fate-dts: REF = $(SAMPLES)/dts/dts.pcm
+
 FATE_TESTS += fate-frwu
 fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi
 
+FATE_TESTS += fate-imc
+fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
+fate-imc: CMP = oneoff
+fate-imc: REF = $(SAMPLES)/imc/imc.pcm
+
 FATE_TESTS += fate-mimic
 fate-mimic: CMD = framecrc -idct simple -i 
$(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -vsync 0
 
+FATE_TESTS += fate-mjpegb
+fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i 
$(SAMPLES)/mjpegb/mjpegb_part.mov -an
+
+FATE_TESTS += fate-mpeg2-field-enc
+fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct 
simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
+
 FATE_TESTS += fate-nuv
 fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -vsync 0
 
diff --git a/tests/fate2.mak b/tests/fate2.mak
deleted file mode 100644
index 0ec49b7..0000000
--- a/tests/fate2.mak
+++ /dev/null
@@ -1,18 +0,0 @@
-FATE_TESTS += fate-mpeg2-field-enc
-fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct 
simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
-
-FATE_TESTS += fate-imc
-fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
-fate-imc: CMP = oneoff
-fate-imc: REF = $(SAMPLES)/imc/imc.pcm
-
-FATE_TESTS += fate-dts
-fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
-fate-dts: CMP = oneoff
-fate-dts: REF = $(SAMPLES)/dts/dts.pcm
-
-FATE_TESTS += fate-ansi
-fate-ansi: CMD = framecrc -chars_per_frame 44100 -i 
$(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
-
-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