diff dvbsubdec.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 04423b2f6e0b
line wrap: on
line diff
--- a/dvbsubdec.c	Sat Jan 03 18:41:35 2009 +0000
+++ b/dvbsubdec.c	Sat Jan 03 19:17:18 2009 +0000
@@ -1305,7 +1305,7 @@
         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 @@
             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++;
     }