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)
* commit 'e524f37356156893cae50fc46451bd4a6198703d':
  asv: Check memory allocation

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

Simple merge