Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'

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

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc tests/fate/image.mak
index 926d637,61d85cd..ce32b36
--- 1/tests/fate/image.mak
--- 2/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@@ -1,30 -1,13 +1,33 @@@
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
  fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
 +FATE_EXR += fate-exr-slice-raw
 +fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-rle
 +fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-zip1
 +fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-zip16
 +fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -pix_fmt rgba64le
 +
 +FATE_EXR += fate-exr-slice-pxr24
 +fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt rgb48le
 +
 +FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR)
 +
 +FATE_IMAGE += $(FATE_EXR-yes)
 +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_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 -fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png
++FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
++fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
  fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
  
  FATE_SUNRASTER += fate-sunraster-1bit-raw

diff --cc tests/ref/fate/pngparser
index 0000000,b481dcd..93005cf
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/pngparser
+++ b/tests/ref/fate/pngparser
@@@ -1,0 -1,5 +1,5 @@@
 -0,          0,          0,        1,   271040, 0xffe62f5f
 -0,          1,          1,        1,   271040, 0xcf502f5f
 -0,          2,          2,        1,   271040, 0x72612f5f
 -0,          3,          3,        1,   271040, 0x41cb2f5f
+ #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