Mercurial > libavcodec.hg
diff xsubdec.c @ 8516:315b302fcd1d libavcodec
Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.
author | michael |
---|---|
date | Sat, 03 Jan 2009 19:17:18 +0000 |
parents | aa45029f5cd7 |
children | 6fc3497dc81f |
line wrap: on
line diff
--- a/xsubdec.c Sat Jan 03 18:41:35 2009 +0000 +++ b/xsubdec.c Sat Jan 03 19:17:18 2009 +0000 @@ -84,28 +84,28 @@ sub->rects[0] = av_mallocz(sizeof(*sub->rects[0])); sub->num_rects = 1; } - av_freep(&sub->rects[0]->bitmap); + 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]->linesize = w; - sub->rects[0]->bitmap = av_malloc(w * h); + sub->rects[0]->pict.linesize[0] = w; + sub->rects[0]->pict.data[0] = av_malloc(w * h); sub->rects[0]->nb_colors = 4; - sub->rects[0]->rgba_palette = av_malloc(sub->rects[0]->nb_colors * 4); + sub->rects[0]->pict.data[1] = av_malloc(sub->rects[0]->nb_colors * 4); // read palette for (i = 0; i < sub->rects[0]->nb_colors; i++) - sub->rects[0]->rgba_palette[i] = bytestream_get_be24(&buf); + ((uint32_t*)sub->rects[0]->pict.data[1])[i] = bytestream_get_be24(&buf); // make all except background (first entry) non-transparent for (i = 1; i < sub->rects[0]->nb_colors; i++) - sub->rects[0]->rgba_palette[i] |= 0xff000000; + ((uint32_t*)sub->rects[0]->pict.data[1])[i] |= 0xff000000; // process RLE-compressed data rlelen = FFMIN(rlelen, buf_end - buf); init_get_bits(&gb, buf, rlelen * 8); - bitmap = sub->rects[0]->bitmap; + bitmap = sub->rects[0]->pict.data[0]; for (y = 0; y < h; y++) { // interlaced: do odd lines - if (y == (h + 1) / 2) bitmap = sub->rects[0]->bitmap + w; + if (y == (h + 1) / 2) bitmap = sub->rects[0]->pict.data[0] + w; for (x = 0; x < w; ) { int log2 = ff_log2_tab[show_bits(&gb, 8)]; int run = get_bits(&gb, 14 - 4 * (log2 >> 1));