[FFmpeg-cvslog] Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  9 14:39:13 2014 +0100| [3773738e26c9480a9ebdada54016dd2687c66774] | committer: Michael Niedermayer

Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'

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

Conflicts:
	libavcodec/vp9block.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3773738e26c9480a9ebdada54016dd2687c66774
---