[FFmpeg-cvslog] Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 20:25:40 2015 +0100| [c5b6b711b291f7cc3fc215de43896537cb7cfa44] | committer: Michael Niedermayer

Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'

* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
  dvbsubdec: check memory allocations and propagate errors

Conflicts:
	libavcodec/dvbsubdec.c

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

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