Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: add a new segmentation sample.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-segmentation-aq-akiyo
	tests/ref/fate/vp9-segmentation-sf-akiyo

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

tests/fate/vpx.mak

@@ -80,8 +80,8 @@ $(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP
 $(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2)))
 $(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2)))
 $(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
-$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2)))
 $(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo,$(1),$(2)))
+$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2)))
 $(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2)))
 endef