Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:03:20 +0000 (03:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:03:20 +0000 (03:03 +0200)
* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
tests/fate/image.mak
tests/ref/fate/dds-ya

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/image.mak
tests/fate/video.mak

@@@ -32,9 -32,11 +32,11 @@@ fate-bmpparser: CMD = framecrc -f image
  
  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
 -fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/libav_$(1).dds $(DDS_OPTS_$(1))
++fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1))
  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 = 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))))
  
Simple merge