* qatar/master:
  fate: Explicitly specify the pixel format for the pngparser test

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