[FFmpeg-cvslog] Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  9 14:32:09 2014 +0100| [7904dfed7370125c04f243d284c27b0e61015533] | committer: Michael Niedermayer

Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'

* commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3':
  vp8: drop support for real (non-emulated) edges

Conflicts:
	tests/fate/vpx.mak

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

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