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/image.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/image.mak')
| -rw-r--r-- | tests/fate/image.mak | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 4c0d361f28..f5b648e3b9 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,37 +1,32 @@ FATE_IMAGE += fate-dpx fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_IMAGE += fate-fax-g3 -fate-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF - -FATE_IMAGE += fate-fax-g3s -fate-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF - FATE_IMAGE += fate-pictor fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 FATE_IMAGE += fate-ptx fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -FATE_IMAGE += fate-sunraster-1bit-raw +FATE_SUNRASTER += fate-sunraster-1bit-raw fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun -FATE_IMAGE += fate-sunraster-1bit-rle +FATE_SUNRASTER += fate-sunraster-1bit-rle fate-sunraster-1bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-rle.sun -FATE_IMAGE += fate-sunraster-8bit-raw +FATE_SUNRASTER += fate-sunraster-8bit-raw fate-sunraster-8bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24 -FATE_IMAGE += fate-sunraster-8bit-rle +FATE_SUNRASTER += fate-sunraster-8bit-rle fate-sunraster-8bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24 -FATE_IMAGE += fate-sunraster-24bit-raw +FATE_SUNRASTER += fate-sunraster-24bit-raw fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.sun -FATE_IMAGE += fate-sunraster-24bit-rle +FATE_SUNRASTER += fate-sunraster-24bit-rle fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun -FATE_TESTS += $(FATE_IMAGE) -fate-image: $(FATE_IMAGE) + +FATE_IMAGE += $(FATE_SUNRASTER) +fate-sunraster: $(FATE_SUNRASTER) FATE_TARGA = CBW8 \ CCM8 \ @@ -47,7 +42,7 @@ FATE_TARGA = CBW8 \ FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ fate-targa-top-to-bottom -FATE_TESTS += $(FATE_TARGA) +FATE_IMAGE += $(FATE_TARGA) fate-targa: $(FATE_TARGA) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA @@ -62,3 +57,16 @@ fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga + +FATE_TIFF += fate-tiff-fax-g3 +fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF + +FATE_TIFF += fate-tiff-fax-g3s +fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF + +FATE_IMAGE += $(FATE_TIFF) +fate-tiff: $(FATE_TIFF) + +FATE_TESTS += $(FATE_IMAGE) +fate-image: $(FATE_IMAGE) + |