[FFmpeg-cvslog] Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 22:30:58 2015 +0100| [3d5c0ba816b97d45ccba229ed1a0ff9d82952e1e] | committer: Michael Niedermayer

Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'

* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
  dvdsubdec: Check memory allocations

Conflicts:
	libavcodec/dvdsubdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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