Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add a bmpparser test

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

tests/fate/image.mak

@@ -27,6 +27,9 @@ FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX)
 FATE_IMAGE += $(FATE_BRENDERPIX-yes)
 fate-brenderpix: $(FATE_BRENDERPIX-yes)
 
+FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser
+fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24
+
 FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
 

tests/ref/fate/bmpparser

+#tb 0: 1/25
+0,          0,          0,        1,     3600, 0xd3a7c583
+0,          1,          1,        1,     3600, 0x4602bbf9
+0,          2,          2,        1,     3600, 0x3a96b8f8
+0,          3,          3,        1,     3600, 0xb343b17f