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

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