Merge commit 'ca96e337'

* commit 'ca96e337':
  vp9: drop support for real (non-emulated) edges

Conflicts:
	libavcodec/vp9block.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;

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)