Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 09:37:36 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 09:38:36 +0000 (11:38 +0200)
commit70025c07a70334756b429f2892ee9ee9bbec119f
treec814a2c50499f96a5d8c9fffe26d497e6896b2e0
parent5fcd0a80a25deb4b0a59779dd00ee0f6b0312e6b
parent41a10f3ba149a2012de499d0b4ad4955d81f28d5
Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5'

* commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5':
  vp6: Support cropping to AVCodecContext.width/height

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