diff options
| -rw-r--r-- | libavcodec/vp9block.c | 4 | ||||
| -rw-r--r-- | tests/fate/vpx.mak | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c index e6865934c4..caf3bcc2ae 100644 --- a/libavcodec/vp9block.c +++ b/libavcodec/vp9block.c @@ -1583,9 +1583,9 @@ int ff_vp9_decode_block(AVCodecContext *avctx, int row, int col, * This allows to support emu-edge and so on even if we have large * block overhangs. */ emu[0] = (col + w4) * 8 > s->cur_frame->linesize[0] || - (row + h4) > s->rows + 2 * !(avctx->flags & CODEC_FLAG_EMU_EDGE); + (row + h4) > s->rows; emu[1] = (col + w4) * 4 > s->cur_frame->linesize[1] || - (row + h4) > s->rows + 2 * !(avctx->flags & CODEC_FLAG_EMU_EDGE); + (row + h4) > s->rows; if (emu[0]) { b->dst[0] = s->tmp_y; b->y_stride = 64; diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index d1ed374b78..f969738994 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -78,7 +78,6 @@ $(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(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) |