summaryrefslogtreecommitdiff
path: root/libavcodec/ass_split.h
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2014-10-11 16:10:51 +0200
committerClément Bœsch <u@pkh.me>2014-10-15 19:25:06 +0200
commitd9f272fe33063350127d1d6632804f4f0fd8dd9c (patch)
tree241f9c4417b98b839d392475894f40309855ce62 /libavcodec/ass_split.h
parent40b9f28641b696c6bb73ce49dc97c2ce2700cbdb (diff)
downloadffmpeg-d9f272fe33063350127d1d6632804f4f0fd8dd9c.tar.gz
avcodec/ass_split: extend recognized fields in ASS splitter
This simplifies the logic for the fix in the next commit.
Diffstat (limited to 'libavcodec/ass_split.h')
-rw-r--r--libavcodec/ass_split.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h
index 06c1ce3309..c9122526c0 100644
--- a/libavcodec/ass_split.h
+++ b/libavcodec/ass_split.h
@@ -41,13 +41,28 @@ typedef struct {
char *font_name; /**< font face (case sensitive) */
int font_size; /**< font height */
int primary_color; /**< color that a subtitle will normally appear in */
+ int secondary_color;
+ int outline_color; /**< color for outline in ASS, called tertiary in SSA */
int back_color; /**< color of the subtitle outline or shadow */
int bold; /**< whether text is bold (1) or not (0) */
int italic; /**< whether text is italic (1) or not (0) */
int underline; /**< whether text is underlined (1) or not (0) */
+ int strikeout;
+ float scalex;
+ float scaley;
+ float spacing;
+ float angle;
+ int border_style;
+ float outline;
+ float shadow;
int alignment; /**< position of the text (left, center, top...),
defined after the layout of the numpad
(1-3 sub, 4-6 mid, 7-9 top) */
+ int margin_l;
+ int margin_r;
+ int margin_v;
+ int alpha_level;
+ int encoding;
} ASSStyle;
/**
@@ -58,6 +73,11 @@ typedef struct {
int start; /**< start time of the dialog in centiseconds */
int end; /**< end time of the dialog in centiseconds */
char *style; /**< name of the ASSStyle to use with this dialog */
+ char *name;
+ int margin_l;
+ int margin_r;
+ int margin_v;
+ char *effect;
char *text; /**< actual text which will be displayed as a subtitle,
can include style override control codes (see
ff_ass_split_override_codes()) */