Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 13:32:09 +0000 (14:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 13:32:09 +0000 (14:32 +0100)
* commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3':
  vp8: drop support for real (non-emulated) edges

Conflicts:
tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vp8.c
tests/fate/vpx.mak

Simple merge
@@@ -53,8 -47,8 +53,8 @@@ fate-vp8-size-change$(1): CMD = framemd
  fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
  endef
  
 -$(call FATE_VP8_FULL)
 +$(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)