ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sat Sep 17 23:18:27 2016 +0200| [6cbd47bf90d38aadba0f0cea4493c23ece77ac8f] | committer: Paul B Mahol
avcodec/dvdsubdec: ignore h <= 1 case, to properly decode subtitle Fixes #5825. If h == 1, second decode_rle() fails. Regression since: 3f0a3e9e127d067c5cf65640a44765c1ddd01622. Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cbd47bf90d38aadba0f0cea4493c23ece77ac8f --- libavcodec/dvdsubdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 19f25f0..b81b481 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -368,7 +368,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, h = y2 - y1 + 1; if (h < 0) h = 0; - if (w > 0 && h > 0) { + if (w > 0 && h > 1) { reset_rects(sub_header); sub_header->rects = av_mallocz(sizeof(*sub_header->rects)); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
