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)
commit7904dfed7370125c04f243d284c27b0e61015533
treee9127d4cfe371f563467b9bd238c030f220da36f
parent2830f287e2f271bcf773f645e5d9cb9aa5204f7f
parentef8c93e2f18c624d0c266687e43ab99af7921dd3
Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'

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

Conflicts:
tests/fate/vpx.mak

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