Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'

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

Conflicts:
	tests/fate/image.mak

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

diff --cc tests/fate/image.mak
index 36e127bd7ca7010db51429ead65db6dbf06f8f97,26cd6f0b4a04c51eb1ad5af1a2a50eac6b06fef2..6b173217ecfa083bce3e41f9f975f43338080d76
--- 1/tests/fate/image.mak
--- 2/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@@ -125,13 -105,15 +125,23 @@@ fate-tiff-fax-g3s: CMD = framecrc -i $(
  
  FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF)
  
 -FATE_SAMPLES_AVCONV += $(FATE_TIFF-yes)
 +FATE_IMAGE += $(FATE_TIFF-yes)
  fate-tiff: $(FATE_TIFF-yes)
  
 -FATE_SAMPLES_AVCONV += $(FATE_XBM-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)
 +fate-image: $(FATE_IMAGE)

diff --cc tests/ref/fate/xbm11
index 0000000000000000000000000000000000000000,778e8ab702e4e96535e74203bb1f6a3db6d592c1..77192b3e64f74c22e2db862c7799a9a05e0d6e79
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/xbm11
+++ b/tests/ref/fate/xbm11
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,     1500, 0x8b73635a
+ #tb 0: 1/25
++0,          0,          0,        1,     4750, 0xc85f0b6d