diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-23 00:24:10 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-23 00:34:56 +0300 |
| commit | ff68b83968cba999a15b7c981c1bbcc2d608cad2 (patch) | |
| tree | 942b1ea0bb0cd4c72813ad81808b7a5548a427d8 /tests/fate/image.mak | |
| parent | f067ee57c95d724ff795f8d6b0c6ba05010008f1 (diff) | |
| parent | 5c018ee18895f88e9e1d2174059dcdd48bf872d2 (diff) | |
Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
DirectDraw Surface image decoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/image.mak')
| -rw-r--r-- | tests/fate/image.mak | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 6f5e4cb2c6..d1873a6217 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -30,6 +30,18 @@ fate-brenderpix: $(FATE_BRENDERPIX-yes) FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24 +define FATE_IMGSUITE_DDS +FATE_DDS += fate-dds-$(1) +fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds -sws_flags +accurate_rnd+bitexact -pix_fmt rgba +endef + +DDS_FMT = 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 rgb16 rgb24 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) +FATE_IMAGE += $(FATE_DDS-yes) +fate-dds: $(FATE_DDS-yes) + FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx |