diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-14 11:33:25 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-21 12:02:29 +0200 |
| commit | a17a7661906ba295d67afd80ac0770422e1b02b3 (patch) | |
| tree | 37dd2b426804d375f7b79f79c1fca43eb2baac8f /libavcodec/avcodec.h | |
| parent | f890677d05bc4e8b494a73373ab4cc19791bf884 (diff) | |
| download | ffmpeg-a17a7661906ba295d67afd80ac0770422e1b02b3.tar.gz | |
lavc: Add data and linesize to AVSubtitleRect
Use the new fields directly instead of the ones from AVPicture.
This removes a layer of indirection which serves no pratical purpose
whatsoever, and will help in removing AVPicture structure completely
later.
Every subtitle encoder/decoder seamlessly points to the new arrays,
so it is possible to deprecate AVSubtitleRect.pict.
Signed-off-by: Vittorio Giovara <vittorio.giovara@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 5f1755a3ea..42f90d5c70 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3215,11 +3215,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 where 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 |