Merge commit 'e524f37356156893cae50fc46451bd4a6198703d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:41:02 +0000 (01:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:41:21 +0000 (01:41 +0200)
commit7110b024a90097312794b55d1145724e10589c59
treee84346bdd12f0507f24aab853e60eeef2c24011e
parente7a65142b972fc1f7fd020d89c8f82dc3cfbc553
parente524f37356156893cae50fc46451bd4a6198703d
Merge commit 'e524f37356156893cae50fc46451bd4a6198703d'

* commit 'e524f37356156893cae50fc46451bd4a6198703d':
  asv: Check memory allocation

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