avcodec/dvdsubdec: ignore h <= 1 case, to properly decode subtitle

Fixes #5825. If h == 1, second decode_rle() fails.

Regression since: 3f0a3e9e12.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-09-17 23:18:27 +02:00
parent ef42c1de2b
commit 6cbd47bf90

View File

@ -368,7 +368,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
h = y2 - y1 + 1; h = y2 - y1 + 1;
if (h < 0) if (h < 0)
h = 0; h = 0;
if (w > 0 && h > 0) { if (w > 0 && h > 1) {
reset_rects(sub_header); reset_rects(sub_header);
sub_header->rects = av_mallocz(sizeof(*sub_header->rects)); sub_header->rects = av_mallocz(sizeof(*sub_header->rects));