Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add Alias PIX tests

Conflicts:
	tests/fate/image.mak

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

tests/fate/image.mak

@@ -1,3 +1,12 @@
+FATE_ALIASPIX += fate-aliaspix-bgr
+fate-aliaspix-bgr: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/first.pix -pix_fmt bgr24
+
+FATE_ALIASPIX += fate-aliaspix-gray
+fate-aliaspix-gray: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/firstgray.pix -pix_fmt gray
+
+FATE_ALIASPIX-$(call DEMDEC, IMAGE2, ALIAS_PIX) += $(FATE_ALIASPIX)
+FATE_IMAGE += $(FATE_ALIASPIX-yes)
+fate-aliaspix: $(FATE_ALIASPIX-yes)
 FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
 

tests/ref/fate/aliaspix-bgr

@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    36000, 0x9ff1ba55

tests/ref/fate/aliaspix-gray

@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    12000, 0x29f8832c