From 25b4c651a3de58ea14c59131c650593736004686 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 3 Jan 2009 19:17:18 +0000 Subject: Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture. Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dvbsubdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/dvbsubdec.c') diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 785e461072..689c068833 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1305,7 +1305,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf, rect->w = region->width; rect->h = region->height; rect->nb_colors = 16; - rect->linesize = region->width; + rect->pict.linesize[0] = region->width; clut = get_clut(ctx, region->clut); @@ -1325,11 +1325,11 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf, break; } - rect->rgba_palette = av_malloc((1 << region->depth) * sizeof(uint32_t)); - memcpy(rect->rgba_palette, clut_table, (1 << region->depth) * sizeof(uint32_t)); + rect->pict.data[1] = av_malloc((1 << region->depth) * sizeof(uint32_t)); + memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t)); - rect->bitmap = av_malloc(region->buf_size); - memcpy(rect->bitmap, region->pbuf, region->buf_size); + rect->pict.data[0] = av_malloc(region->buf_size); + memcpy(rect->pict.data[0], region->pbuf, region->buf_size); i++; } -- cgit v1.2.3