diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:39:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 14:41:23 +0100 |
| commit | 3773738e26c9480a9ebdada54016dd2687c66774 (patch) | |
| tree | 6c3c25d46b223b157afb0755fb1c188adc240ff1 | |
| parent | 7904dfed7370125c04f243d284c27b0e61015533 (diff) | |
| parent | ca96e337169093979d7c763064ad9dae12b3108c (diff) | |
| download | ffmpeg-3773738e26c9480a9ebdada54016dd2687c66774.tar.gz | |
Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'
* commit 'ca96e337169093979d7c763064ad9dae12b3108c':
vp9: drop support for real (non-emulated) edges
Conflicts:
libavcodec/vp9block.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vp9.c | 4 | ||||
| -rw-r--r-- | tests/fate/vpx.mak | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index b4e8d4e5eb..bba600b73d 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -2747,9 +2747,9 @@ static void decode_b(AVCodecContext *ctx, int row, int col, // allows to support emu-edge and so on even if we have large block // overhangs emu[0] = (col + w4) * 8 > f->linesize[0] || - (row + h4) > s->rows + 2 * !(ctx->flags & CODEC_FLAG_EMU_EDGE); + (row + h4) > s->rows; emu[1] = (col + w4) * 4 > f->linesize[1] || - (row + h4) > s->rows + 2 * !(ctx->flags & CODEC_FLAG_EMU_EDGE); + (row + h4) > s->rows; if (emu[0]) { s->dst[0] = s->tmp_y; s->y_stride = 64; 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) |