summaryrefslogtreecommitdiff
path: root/tests/fate/vpx.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-09 14:39:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-09 14:41:23 +0100
commit3773738e26c9480a9ebdada54016dd2687c66774 (patch)
tree6c3c25d46b223b157afb0755fb1c188adc240ff1 /tests/fate/vpx.mak
parent7904dfed7370125c04f243d284c27b0e61015533 (diff)
parentca96e337169093979d7c763064ad9dae12b3108c (diff)
Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'
* commit 'ca96e337169093979d7c763064ad9dae12b3108c': vp9: drop support for real (non-emulated) edges Conflicts: libavcodec/vp9block.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vpx.mak')
-rw-r--r--tests/fate/vpx.mak1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 18f6068b1d..0f0bad77d5 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -86,7 +86,6 @@ $(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
endef
$(eval $(call FATE_VP9_FULL))
-$(eval $(call FATE_VP9_FULL,-emu-edge,-flags +emu_edge))
FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes)
fate-vp9: $(FATE_VP9-yes)