Merge commit 'd81fb63d87692765c004c19934b49427df434a07'

* commit 'd81fb63d87692765c004c19934b49427df434a07':
  fate: Add a PICT test

Conflicts:
	tests/fate/image.mak

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

diff --cc tests/fate/image.mak
index e17f068,807b118..6f5e4cb
--- 1/tests/fate/image.mak
--- 2/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@@ -53,14 -53,17 +53,17 @@@ fate-exr-slice-pxr24: CMD = framecrc -
  
  FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR)
  
 -FATE_SAMPLES_AVCONV += $(FATE_EXR-yes)
 +FATE_IMAGE += $(FATE_EXR-yes)
  fate-exr: $(FATE_EXR-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict
++FATE_IMAGE-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict
+ fate-pict: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/TRU256.PCT -pix_fmt rgb24
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
 -fate-pictor: CMD = framecrc -c pictor -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 +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 -pix_fmt rgba
 +FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 +fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba
  
  define FATE_IMGSUITE_PNG
  FATE_PNG += fate-png-$(1)