From 6dc13ccbcc12d72b3746664edf44fcccf5d277fb Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Sun, 26 Jul 2009 23:08:04 +0000 Subject: [PATCH] Set subtitle type in DVD and XSUB subtitle decoders. Patch by Janne Grunau . Originally committed as revision 19512 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dvdsubdec.c | 1 + libavcodec/xsubdec.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 8abf700688..6c0756b6a4 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -353,6 +353,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, sub_header->rects[0]->y = y1; sub_header->rects[0]->w = w; sub_header->rects[0]->h = h; + sub_header->rects[0]->type = SUBTITLE_BITMAP; sub_header->rects[0]->pict.linesize[0] = w; } } diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index ccb9bf92e5..4754987f54 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -91,6 +91,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, av_freep(&sub->rects[0]->pict.data[0]); sub->rects[0]->x = x; sub->rects[0]->y = y; sub->rects[0]->w = w; sub->rects[0]->h = h; + sub->rects[0]->type = SUBTITLE_BITMAP; sub->rects[0]->pict.linesize[0] = w; sub->rects[0]->pict.data[0] = av_malloc(w * h); sub->rects[0]->nb_colors = 4; -- 2.11.0