Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:25:40 +0000 (20:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:25:40 +0000 (20:25 +0100)
commitc5b6b711b291f7cc3fc215de43896537cb7cfa44
tree2efc5fdf4b73f5c1edcd19344e2ab2d225611c02
parentf955abe33321f2e28617a3db196be705c5453219
parent607ad990d31e6be52980970e5ce8cd25ab3de812
Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'

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

Conflicts:
libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvbsubdec.c