summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-01-03 19:20:50 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-01-03 19:20:50 +0000
commitf656106f762c63d393300a6be7dfae16c0dfbcc1 (patch)
tree497dc030ec52e7715562d7b5285ff9bdfc614ec0 /libavcodec/avcodec.h
parent25b4c651a3de58ea14c59131c650593736004686 (diff)
Add type, text and ass to AVSubtitleRect.
Originally committed as revision 16417 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 04c17698dc..9c3e7105c6 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2405,6 +2405,16 @@ typedef struct AVSubtitleRect {
* can be set for text/ass as well once they where rendered
*/
AVPicture pict;
+ enum AVSubtitleType type;
+
+ char *text; ///< 0 terminated plain UTF-8 text
+
+ /**
+ * 0 terminated ASS/SSA compatible event line.
+ * The pressentation of this is unaffected by the other values in this
+ * struct.
+ */
+ char *ass;
} AVSubtitleRect;
typedef struct AVSubtitle {