Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.

Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 6 insertions, 3 deletions

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index bda66bba91..04c17698dc 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2399,9 +2399,12 @@ typedef struct AVSubtitleRect {
     int w;         ///< width            of pict, undefined when pict is not set
     int h;         ///< height           of pict, undefined when pict is not set
     int nb_colors; ///< number of colors in pict, undefined when pict is not set
-    int linesize;
-    uint32_t *rgba_palette;
-    uint8_t *bitmap;
+
+    /**
+     * data+linesize for the bitmap of this subtitle.
+     * can be set for text/ass as well once they where rendered
+     */
+    AVPicture pict;
 } AVSubtitleRect;
 
 typedef struct AVSubtitle {