diff options
| author | Derek Buitenhuis | 2016-05-09 15:52:05 +0100 |
|---|---|---|
| committer | Derek Buitenhuis | 2016-05-09 16:25:28 +0100 |
| commit | ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3 (patch) | |
| tree | a1a466cd3186398946e522ecac62ef1e2d85d1b2 /tests/fate | |
| parent | 1a3cff4f7eadad5292b6d65f751b0273d3a4124a (diff) | |
| parent | 01621202aad7e27b2a05c71d9ad7a19dfcbe17ec (diff) | |
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/image.mak | 48 | ||||
| -rw-r--r-- | tests/fate/libavresample.mak | 8 | ||||
| -rw-r--r-- | tests/fate/seek.mak | 16 |
3 files changed, 59 insertions, 13 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index d6084ed93e..baf87a0f98 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -37,7 +37,53 @@ endef DDS_OPTS_pal = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba -DDS_FMT = alpha8 argb argb-aexp dx10-bc1 dx10-bc1a dx10-bc2 dx10-bc3 dx10-bc4 dx10-bc5 dxt1 dxt1a dxt1-normalmap dxt2 dxt3 dxt4 dxt5 dxt5-aexp dxt5-normalmap dxt5-normalmap-ati dxt5-rbxg dxt5-rgxb dxt5-rxbg dxt5-rxgb dxt5-xgbr dxt5-xgxr dxt5-xrbg dxt5-ycocg dxt5-ycocg-scaled pal pal-ati rgb1555 rgb16 rgb24 rgb555 rgba rgtc1s rgtc1u rgtc2s rgtc2u rgtc2u-xy uyvy xbgr xrgb y ya ycocg yuyv +DDS_FMT = alpha8 \ + argb \ + argb-aexp \ + dx10-bc1 \ + dx10-bc1a \ + dx10-bc2 \ + dx10-bc3 \ + dx10-bc4 \ + dx10-bc5 \ + dxt1 \ + dxt1a \ + dxt1-normalmap \ + dxt2 \ + dxt3 \ + dxt4 \ + dxt5 \ + dxt5-aexp \ + dxt5-normalmap \ + dxt5-normalmap-ati \ + dxt5-rbxg \ + dxt5-rgxb \ + dxt5-rxbg \ + dxt5-rxgb \ + dxt5-xgbr \ + dxt5-xgxr \ + dxt5-xrbg \ + dxt5-ycocg \ + dxt5-ycocg-scaled \ + pal \ + pal-ati \ + rgb1555 \ + rgb16 \ + rgb24 \ + rgb555 \ + rgba \ + rgtc1s \ + rgtc1u \ + rgtc2s \ + rgtc2u \ + rgtc2u-xy \ + uyvy \ + xbgr \ + xrgb \ + y \ + ya \ + ycocg \ + yuyv $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT)))) FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS) diff --git a/tests/fate/libavresample.mak b/tests/fate/libavresample.mak index 65c0898d82..da5cbb35f7 100644 --- a/tests/fate/libavresample.mak +++ b/tests/fate/libavresample.mak @@ -1,7 +1,7 @@ -CROSS_TEST = $(foreach I,$(1), \ - $(foreach J,$(1), \ - $(if $(filter-out $(I),$(J)), \ - $(eval $(call $(2),$(I),$(J),$(3),$(4),$(5))), \ +CROSS_TEST = $(foreach I,$(1), \ + $(foreach J,$(1), \ + $(if $(filter-out $(I),$(J)), \ + $(eval $(call $(2),$(I),$(J),$(3),$(4),$(5))), \ ))) MIX_CHANNELS = 1 2 3 4 5 6 7 8 diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index 4722cd497d..6e4df91309 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -79,16 +79,16 @@ FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS, AVI) += jpegls FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ - mpeg1 \ +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ + mpeg1 \ mpeg1b -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) += \ - mpeg2-422 \ - mpeg2-idct-int \ - mpeg2-ilace \ - mpeg2-ivlc-qprd \ - mpeg2-thread \ +FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) += \ + mpeg2-422 \ + mpeg2-idct-int \ + mpeg2-ilace \ + mpeg2-ivlc-qprd \ + mpeg2-thread \ mpeg2-thread-ivlc FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4 |