Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 21:19:54 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 21:19:54 +0000 (22:19 +0100)
commit4809ac75fcefe198e70936d49160036818f12e2b
treed77d672bcb8549a708a48e0426b82bba485cba09
parent6229f7823e2a9b93a95ce27c10efc156a555c20d
parent2383323661f3b8342b2c4d356fcfe8c5d1b045f8
Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'

* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
libavcodec/dvbsubdec.c

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