diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:32:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:32:09 +0100 |
| commit | 7904dfed7370125c04f243d284c27b0e61015533 (patch) | |
| tree | e9127d4cfe371f563467b9bd238c030f220da36f /tests/fate/vpx.mak | |
| parent | 2830f287e2f271bcf773f645e5d9cb9aa5204f7f (diff) | |
| parent | ef8c93e2f18c624d0c266687e43ab99af7921dd3 (diff) | |
| download | ffmpeg-7904dfed7370125c04f243d284c27b0e61015533.tar.gz | |
Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'
* commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3':
vp8: drop support for real (non-emulated) edges
Conflicts:
tests/fate/vpx.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vpx.mak')
| -rw-r--r-- | tests/fate/vpx.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index de0b58fa9b..18f6068b1d 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -54,7 +54,7 @@ fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change endef $(eval $(call FATE_VP8_FULL)) -$(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge)) + FATE_SAMPLES_AVCONV-$(CONFIG_VP8_DECODER) += $(FATE_VP8-yes) fate-vp8: $(FATE_VP8-yes) |