[FFmpeg-cvslog] Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 02:12:26 2015 +0200| [1a903f0d1e989bc6fba98fdcbf8e222b5b8cfc6c] | committer: Michael Niedermayer

Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'

* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
  xvid: Check memory allocation

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a903f0d1e989bc6fba98fdcbf8e222b5b8cfc6c
---