Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add SGI tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

tests/fate/image.mak

@@ -62,6 +62,38 @@ fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_c
 FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
+FATE_SGI += fate-sgi-gray
+fate-sgi-gray: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray.sgi -pix_fmt gray
+
+FATE_SGI += fate-sgi-gray16
+fate-sgi-gray16: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray16.sgi -pix_fmt gray16
+
+FATE_SGI += fate-sgi-rgb24
+fate-sgi-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgb24.sgi -pix_fmt rgb24
+
+FATE_SGI += fate-sgi-rgb24-rle
+fate-sgi-rgb24-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb24_rle.sgi -pix_fmt rgb24
+
+FATE_SGI += fate-sgi-rgb48
+fate-sgi-rgb48: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgb48.sgi -pix_fmt rgb48be
+
+FATE_SGI += fate-sgi-rgb48-rle
+fate-sgi-rgb48-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/uvmap_rgb48_rle.sgi -pix_fmt rgb48be
+
+FATE_SGI += fate-sgi-rgba
+fate-sgi-rgba: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgba.sgi -pix_fmt rgba
+
+FATE_SGI += fate-sgi-rgba64
+fate-sgi-rgba64: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgba64.sgi -pix_fmt rgba64be
+
+FATE_SGI += fate-sgi-rgba64-rle
+fate-sgi-rgba64-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/maya_rgba64_rle.sgi -pix_fmt rgba64be
+
+FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI)
+
+FATE_SAMPLES_AVCONV += $(FATE_SGI-yes)
+fate-sgi: $(FATE_SGI-yes)
+
 FATE_SUNRASTER += fate-sunraster-1bit-raw
 fate-sunraster-1bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-raw.sun
 

tests/ref/fate/sgi-gray

+#tb 0: 1/25
+0,          0,          0,        1,    65536, 0xe36c12e1

tests/ref/fate/sgi-gray16

+#tb 0: 1/25
+0,          0,          0,        1,   131072, 0x6855d247

tests/ref/fate/sgi-rgb24

+#tb 0: 1/25
+0,          0,          0,        1,   196608, 0x5b24c51a

tests/ref/fate/sgi-rgb24-rle

+#tb 0: 1/25
+0,          0,          0,        1,   393216, 0xe96e1de2

tests/ref/fate/sgi-rgb48

+#tb 0: 1/25
+0,          0,          0,        1,   393216, 0xf6b0d73a

tests/ref/fate/sgi-rgb48-rle

+#tb 0: 1/25
+0,          0,          0,        1,   786432, 0xbc743bc4

tests/ref/fate/sgi-rgba

+#tb 0: 1/25
+0,          0,          0,        1,   262144, 0x7b38d40b

tests/ref/fate/sgi-rgba64

+#tb 0: 1/25
+0,          0,          0,        1,   524288, 0xce70f51c

tests/ref/fate/sgi-rgba64-rle

+#tb 0: 1/25
+0,          0,          0,        1,   614400, 0xb92d409d