diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:21:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:21:41 +0100 |
| commit | af164d7d9f12f9c2a4b284957eb92ad74cd49b3d (patch) | |
| tree | 942f8ceec8738f4436612742a0d08c180c67193d /tests/fate | |
| parent | 8ca8b43d7108b9d7e6887fd553d13a71afa670c6 (diff) | |
| parent | c25fc5c2bb6ae8c93541c9427df3e47206d95152 (diff) | |
| download | ffmpeg-af164d7d9f12f9c2a4b284957eb92ad74cd49b3d.tar.gz | |
Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'
* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152':
fate: dpcm: Add dependencies
SBR DSP x86: implement SSE sbr_hf_gen
AAC SBR: use AVFloatDSPContext's vector_fmul
fate: image: Add dependencies
Changelog: add an entry for deprecating the avconv -vol option
x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32
Conflicts:
Changelog
libavutil/x86/float_dsp.asm
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/dpcm.mak | 12 | ||||
| -rw-r--r-- | tests/fate/image.mak | 27 |
2 files changed, 23 insertions, 16 deletions
diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak index 14e77a20f4..abc25edc9b 100644 --- a/tests/fate/dpcm.mak +++ b/tests/fate/dpcm.mak @@ -1,14 +1,14 @@ -FATE_DPCM += fate-dpcm-idroq +FATE_DPCM-$(call DEMDEC, ROQ, ROQ_DPCM) += fate-dpcm-idroq fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -vn -FATE_DPCM += fate-dpcm-interplay +FATE_DPCM-$(call DEMDEC, IPMOVIE, INTERPLAY_DPCM) += fate-dpcm-interplay fate-dpcm-interplay: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn -FATE_DPCM += fate-dpcm-sierra +FATE_DPCM-$(call DEMDEC, SOL, SOL_DPCM) += fate-dpcm-sierra fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le -FATE_DPCM += fate-dpcm-xan +FATE_DPCM-$(call DEMDEC, AVI, XAN_DPCM) += fate-dpcm-xan fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le -FATE_SAMPLES_AVCONV += $(FATE_DPCM) -fate-dpcm: $(FATE_DPCM) +FATE_SAMPLES_AVCONV += $(FATE_DPCM-yes) +fate-dpcm: $(FATE_DPCM-yes) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 8770c74e1b..abafd5f907 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,10 +1,10 @@ -FATE_IMAGE += fate-dpx +FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_IMAGE += fate-pictor +FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -FATE_IMAGE += fate-ptx +FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 FATE_SUNRASTER += fate-sunraster-1bit-raw @@ -28,8 +28,10 @@ fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw. FATE_SUNRASTER += fate-sunraster-24bit-rle fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun -FATE_IMAGE += $(FATE_SUNRASTER) -fate-sunraster: $(FATE_SUNRASTER) +FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER) + +FATE_IMAGE += $(FATE_SUNRASTER-yes) +fate-sunraster: $(FATE_SUNRASTER-yes) FATE_TARGA = CBW8 \ CCM8 \ @@ -45,8 +47,10 @@ FATE_TARGA = CBW8 \ FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ fate-targa-top-to-bottom -FATE_IMAGE += $(FATE_TARGA) -fate-targa: $(FATE_TARGA) +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA) + +FATE_IMAGE += $(FATE_TARGA-yes) +fate-targa: $(FATE_TARGA-yes) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba @@ -67,12 +71,15 @@ 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_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF) + +FATE_IMAGE += $(FATE_TIFF-yes) +fate-tiff: $(FATE_TIFF-yes) FATE_IMAGE += fate-xface fate-xface: CMD = framecrc -i $(SAMPLES)/xface/lena.xface +FATE_IMAGE += $(FATE_IMAGE-yes) + FATE_SAMPLES_FFMPEG += $(FATE_IMAGE) fate-image: $(FATE_IMAGE) - |