diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
| commit | 48706f41e1a17e04b0aa09852eff021833708233 (patch) | |
| tree | d33af96fedd771264c6717eacd2d54800bc05aff /tests/fate/screen.mak | |
| parent | 9d35fa43eea1c0646a5f3e4ba537d58f574b9ca7 (diff) | |
| parent | a85ce653fb14ae968419453fabf1ffe10d1f15df (diff) | |
| download | ffmpeg-48706f41e1a17e04b0aa09852eff021833708233.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12: check for available bits to avoid an infinite loop
fate: add some shorthands to run groups of tests
fate: Give some tests more sensible names.
cosmetics: Rename ffsink to avsink.
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/dpcm.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/wma.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/screen.mak')
| -rw-r--r-- | tests/fate/screen.mak | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 0bc06e85a0..a115fd00cf 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -4,47 +4,59 @@ fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -vsync 0 -pix_ FATE_SCREEN += fate-dxtory fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi -FATE_SCREEN += fate-fraps-v0 +FATE_FRAPS += fate-fraps-v0 fate-fraps-v0: CMD = framecrc -i $(SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi -FATE_SCREEN += fate-fraps-v1 +FATE_FRAPS += fate-fraps-v1 fate-fraps-v1: CMD = framecrc -i $(SAMPLES)/fraps/sample-v1.avi -an -FATE_SCREEN += fate-fraps-v2 +FATE_FRAPS += fate-fraps-v2 fate-fraps-v2: CMD = framecrc -i $(SAMPLES)/fraps/test3-nosound-partial.avi -FATE_SCREEN += fate-fraps-v3 +FATE_FRAPS += fate-fraps-v3 fate-fraps-v3: CMD = framecrc -i $(SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24 -FATE_SCREEN += fate-fraps-v4 +FATE_FRAPS += fate-fraps-v4 fate-fraps-v4: CMD = framecrc -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi -FATE_SCREEN += fate-fraps-v5 +FATE_FRAPS += fate-fraps-v5 fate-fraps-v5: CMD = framecrc -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -FATE_SCREEN += fate-tscc-15bit +FATE_SCREEN += $(FATE_FRAPS) +fate-fraps: $(FATE_FRAPS) + +FATE_TSCC += fate-tscc-15bit fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24 -FATE_SCREEN += fate-tscc-32bit +FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -FATE_SCREEN += fate-vmnc-16bit +FATE_SCREEN += $(FATE_TSCC) +fate-tscc: $(FATE_TSCC) + +FATE_VMNC += fate-vmnc-16bit fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24 -FATE_SCREEN += fate-vmnc-32bit +FATE_VMNC += fate-vmnc-32bit fate-vmnc-32bit: CMD = framecrc -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 -FATE_SCREEN += fate-zmbv-8bit +FATE_SCREEN += $(FATE_VMNC) +fate-vmnc: $(FATE_VMNC) + +FATE_ZMBV += fate-zmbv-8bit fate-zmbv-8bit: CMD = framecrc -i $(SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24 -FATE_SCREEN += fate-zmbv-15bit +FATE_ZMBV += fate-zmbv-15bit fate-zmbv-15bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25 -FATE_SCREEN += fate-zmbv-16bit +FATE_ZMBV += fate-zmbv-16bit fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25 -FATE_SCREEN += fate-zmbv-32bit +FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 +FATE_SCREEN += $(FATE_ZMBV) +fate-zmbv: $(FATE_ZMBV) + FATE_TESTS += $(FATE_SCREEN) fate-screen: $(FATE_SCREEN) |