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)
commit1a903f0d1e989bc6fba98fdcbf8e222b5b8cfc6c
tree62b14529d40d3480b6acf4e24c917525eea24911
parent8b94cee99bf13d3216294292a498b095f0947c90
parentfef2f4722bcbfe1c3802898b0f5deb6356132c91
Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'

* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
  xvid: Check memory allocation

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