Merge commit 'cfb4ee30'

* commit 'cfb4ee30':
  fate: add a pngparser test

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

tests/fate/image.mak

@@ -24,6 +24,9 @@ fate-exr: $(FATE_EXR-yes)
 FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
 fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 
+FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
+fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png
+
 FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 

tests/ref/fate/pngparser

+#tb 0: 1/25
+0,          0,          0,        1,     1600, 0x01a481a9
+0,          1,          1,        1,     1600, 0x01a481a9
+0,          2,          2,        1,     1600, 0x01a481a9
+0,          3,          3,        1,     1600, 0x01a481a9