Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:12:26 +0000 (02:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:12:58 +0000 (02:12 +0200)
* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
  xvid: Check memory allocation

See: 5c95de150f3b18f2e76fed670d6ea579feab1206 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge