Commit c66216ed authored by Michael Niedermayer's avatar Michael Niedermayer

Add enum AVSubtitleType

Originally committed as revision 16410 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 37fed100
...@@ -2375,6 +2375,24 @@ typedef struct AVPaletteControl { ...@@ -2375,6 +2375,24 @@ typedef struct AVPaletteControl {
} AVPaletteControl attribute_deprecated; } AVPaletteControl attribute_deprecated;
enum AVSubtitleType {
SUBTITLE_NONE,
SUBTITLE_BITMAP, ///< A bitmap, pict will be set
/**
* Plain text, the text field must be set by the decoder and is
* authoritative. ass and pict fields may contain approximations.
*/
SUBTITLE_TEXT,
/**
* Formatted text, the ass field must be set by the decoder and is
* authoritative. pict and text fields may contain approximations.
*/
SUBTITLE_ASS,
};
typedef struct AVSubtitleRect { typedef struct AVSubtitleRect {
uint16_t x; uint16_t x;
uint16_t y; uint16_t y;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment