aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-13 00:32:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-13 00:33:31 +0100
commit89c5de66523b1b2895a408a213bf06e6580cdc8f (patch)
treebee4f47bc015645a556412c7ed31de2f6ce32745
parent86316039ab06bcf5c8b9c14f535f1dd072990e3b (diff)
parent91be8df20b57a18307e90f1c4886a35ea7b28880 (diff)
downloadffmpeg-89c5de66523b1b2895a408a213bf06e6580cdc8f.tar.gz
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>
-rw-r--r--tests/fate/vpx.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 0f0bad77d5..b46bba1199 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -79,10 +79,10 @@ $(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP
$(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,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))