diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:18:03 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:41:53 +0200 |
| commit | ee573b4d31d49280df0fbec61af6184130d26737 (patch) | |
| tree | 46f462f7e70dadd32d21e932449cd3124404a7a2 /libavcodec/avcodec.h | |
| parent | 37498a4b202e332e690ba02b9ab04afcbb08c9a5 (diff) | |
| parent | a17a7661906ba295d67afd80ac0770422e1b02b3 (diff) | |
| download | ffmpeg-ee573b4d31d49280df0fbec61af6184130d26737.tar.gz | |
Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'
* commit 'a17a7661906ba295d67afd80ac0770422e1b02b3':
lavc: Add data and linesize to AVSubtitleRect
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c55aa9452e..7d47698531 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3618,11 +3618,20 @@ typedef struct AVSubtitleRect { 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 +#if FF_API_AVPICTURE /** - * data+linesize for the bitmap of this subtitle. - * can be set for text/ass as well once they are rendered + * @deprecated unused */ + attribute_deprecated AVPicture pict; +#endif + /** + * data+linesize for the bitmap of this subtitle. + * Can be set for text/ass as well once they are rendered. + */ + uint8_t *data[4]; + int linesize[4]; + enum AVSubtitleType type; char *text; ///< 0 terminated plain UTF-8 text |