summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-01-03 15:15:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-01-03 15:15:03 +0000
commitc66216ed5d3ba252b794aee10e6dba01a020bcda (patch)
tree58e6e3a2847a09870e394c9bf6a253929ff778c3 /libavcodec/avcodec.h
parent37fed100873707b070ba692a0b46e545a08e53c1 (diff)
Add enum AVSubtitleType
Originally committed as revision 16410 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 4dbfa1e7e1..a409f1538b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2375,6 +2375,24 @@ typedef struct AVPaletteControl {
} 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 {
uint16_t x;
uint16_t y;