Merge commit '991362fa'

* commit '991362fa':
  fate: add XBM tests

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

tests/fate/image.mak

@@ -131,6 +131,16 @@ fate-tiff: $(FATE_TIFF-yes)
 FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface
 fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface
 
+FATE_XBM += fate-xbm10
+fate-xbm10: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/xl.xbm
+
+FATE_XBM += fate-xbm11
+fate-xbm11: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/lbw.xbm
+
+FATE_XBM-$(call DEMDEC, IMAGE2, XBM) += $(FATE_XBM)
+FATE_IMAGE += $(FATE_XBM-yes)
+fate-xbm: $(FATE_XBM-yes)
+
 FATE_IMAGE += $(FATE_IMAGE-yes)
 
 FATE_SAMPLES_FFMPEG += $(FATE_IMAGE)

tests/ref/fate/xbm10

+#tb 0: 1/25
+0,          0,          0,        1,       32, 0x777f0737

tests/ref/fate/xbm11

+#tb 0: 1/25
+0,          0,          0,        1,     4750, 0xc85f0b6d