Merge commit '91be8df20b57a18307e90f1c4886a35ea7b28880'

* commit '91be8df20b57a18307e90f1c4886a35ea7b28880':
  vp9: add fate sample for parallelmode.

Conflicts:
	tests/fate/vpx.mak
	tests/ref/fate/vp9-parallelmode-akiyo

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

diff --cc tests/fate/vpx.mak
index 0f0bad7,5bb0243..b46bba1
--- 1/tests/fate/vpx.mak
--- 2/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@@ -79,10 -73,9 +79,10 @@@ $(foreach W,$(VP9_SIZE_A),$(eval $(fore
  $(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H),$(1),$(2))))))
  $(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2)))
  $(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2)))
 -$(eval $(call FATE_VP9_SUITE,segmentation-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,tiling-pedestrian,$(1),$(2)))
- $(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
  endef
  
  $(eval $(call FATE_VP9_FULL))