Merge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 12:10:37 +0000 (13:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 12:10:48 +0000 (13:10 +0100)
commit9fb5a91c66934dab395ff32eb524a3dbe08b53d8
treec81542e7d48c8e7bf3b248a09b86a227c68ce023
parenteb215be9ce74f90d5aff304ad593f17a313f71fd
parent014b6b416fec89777cb9cff61bcf7896eaf7cf39
Merge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39'

* commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39':
  vp8: improve memory allocation checks

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