diff options
| author | Clément Bœsch <u@pkh.me> | 2014-10-11 20:16:43 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2014-10-15 19:25:06 +0200 |
| commit | 462f2876ce41f27000da3c23441a0a086f290499 (patch) | |
| tree | 0d8b55c133e818781bdc274b98e6b92103a57c87 /libavcodec | |
| parent | 3e86ead383c189d4eb41b3e4b33798eecf51a759 (diff) | |
| download | ffmpeg-462f2876ce41f27000da3c23441a0a086f290499.tar.gz | |
avcodec/ass_split: realign after addition of new fields
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ass_split.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index bd7db93e65..cc4f961c4d 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -64,29 +64,29 @@ static const ASSSection ass_sections[] = { .size = sizeof(ASSStyle), .offset = offsetof(ASS, styles), .offset_count = offsetof(ASS, styles_count), - .fields = {{"Name", ASS_STR, offsetof(ASSStyle, name) }, - {"Fontname", ASS_STR, offsetof(ASSStyle, font_name) }, - {"Fontsize", ASS_INT, offsetof(ASSStyle, font_size) }, - {"PrimaryColour",ASS_COLOR,offsetof(ASSStyle, primary_color)}, - {"SecondaryColour",ASS_COLOR,offsetof(ASSStyle, secondary_color)}, - {"OutlineColour",ASS_COLOR,offsetof(ASSStyle, outline_color)}, - {"BackColour", ASS_COLOR,offsetof(ASSStyle, back_color) }, - {"Bold", ASS_INT, offsetof(ASSStyle, bold) }, - {"Italic", ASS_INT, offsetof(ASSStyle, italic) }, - {"Underline", ASS_INT, offsetof(ASSStyle, underline) }, - {"StrikeOut", ASS_INT, offsetof(ASSStyle, strikeout) }, - {"ScaleX", ASS_FLT, offsetof(ASSStyle, scalex) }, - {"ScaleY", ASS_FLT, offsetof(ASSStyle, scaley) }, - {"Spacing", ASS_FLT, offsetof(ASSStyle, spacing) }, - {"Angle", ASS_FLT, offsetof(ASSStyle, angle) }, - {"BorderStyle", ASS_INT, offsetof(ASSStyle, border_style) }, - {"Outline", ASS_FLT, offsetof(ASSStyle, outline) }, - {"Shadow", ASS_FLT, offsetof(ASSStyle, shadow) }, - {"Alignment", ASS_INT, offsetof(ASSStyle, alignment) }, - {"MarginL", ASS_INT, offsetof(ASSStyle, margin_l) }, - {"MarginR", ASS_INT, offsetof(ASSStyle, margin_r) }, - {"MarginV", ASS_INT, offsetof(ASSStyle, margin_v) }, - {"Encoding", ASS_INT, offsetof(ASSStyle, encoding) }, + .fields = {{"Name", ASS_STR, offsetof(ASSStyle, name) }, + {"Fontname", ASS_STR, offsetof(ASSStyle, font_name) }, + {"Fontsize", ASS_INT, offsetof(ASSStyle, font_size) }, + {"PrimaryColour", ASS_COLOR, offsetof(ASSStyle, primary_color) }, + {"SecondaryColour", ASS_COLOR, offsetof(ASSStyle, secondary_color)}, + {"OutlineColour", ASS_COLOR, offsetof(ASSStyle, outline_color) }, + {"BackColour", ASS_COLOR, offsetof(ASSStyle, back_color) }, + {"Bold", ASS_INT, offsetof(ASSStyle, bold) }, + {"Italic", ASS_INT, offsetof(ASSStyle, italic) }, + {"Underline", ASS_INT, offsetof(ASSStyle, underline) }, + {"StrikeOut", ASS_INT, offsetof(ASSStyle, strikeout) }, + {"ScaleX", ASS_FLT, offsetof(ASSStyle, scalex) }, + {"ScaleY", ASS_FLT, offsetof(ASSStyle, scaley) }, + {"Spacing", ASS_FLT, offsetof(ASSStyle, spacing) }, + {"Angle", ASS_FLT, offsetof(ASSStyle, angle) }, + {"BorderStyle", ASS_INT, offsetof(ASSStyle, border_style) }, + {"Outline", ASS_FLT, offsetof(ASSStyle, outline) }, + {"Shadow", ASS_FLT, offsetof(ASSStyle, shadow) }, + {"Alignment", ASS_INT, offsetof(ASSStyle, alignment) }, + {"MarginL", ASS_INT, offsetof(ASSStyle, margin_l) }, + {"MarginR", ASS_INT, offsetof(ASSStyle, margin_r) }, + {"MarginV", ASS_INT, offsetof(ASSStyle, margin_v) }, + {"Encoding", ASS_INT, offsetof(ASSStyle, encoding) }, {0}, } }, @@ -96,24 +96,24 @@ static const ASSSection ass_sections[] = { .size = sizeof(ASSStyle), .offset = offsetof(ASS, styles), .offset_count = offsetof(ASS, styles_count), - .fields = {{"Name", ASS_STR, offsetof(ASSStyle, name) }, - {"Fontname", ASS_STR, offsetof(ASSStyle, font_name) }, - {"Fontsize", ASS_INT, offsetof(ASSStyle, font_size) }, - {"PrimaryColour",ASS_COLOR,offsetof(ASSStyle, primary_color)}, - {"SecondaryColour", ASS_COLOR, offsetof(ASSStyle, secondary_color) }, - {"TertiaryColour", ASS_COLOR, offsetof(ASSStyle, outline_color) }, - {"BackColour", ASS_COLOR,offsetof(ASSStyle, back_color) }, - {"Bold", ASS_INT, offsetof(ASSStyle, bold) }, - {"Italic", ASS_INT, offsetof(ASSStyle, italic) }, - {"BorderStyle", ASS_INT, offsetof(ASSStyle, border_style) }, - {"Outline", ASS_FLT, offsetof(ASSStyle, outline) }, - {"Shadow", ASS_FLT, offsetof(ASSStyle, shadow) }, - {"Alignment", ASS_ALGN, offsetof(ASSStyle, alignment) }, - {"MarginL", ASS_INT, offsetof(ASSStyle, margin_l) }, - {"MarginR", ASS_INT, offsetof(ASSStyle, margin_r) }, - {"MarginV", ASS_INT, offsetof(ASSStyle, margin_v) }, - {"AlphaLevel", ASS_INT, offsetof(ASSStyle, alpha_level) }, - {"Encoding", ASS_INT, offsetof(ASSStyle, encoding) }, + .fields = {{"Name", ASS_STR, offsetof(ASSStyle, name) }, + {"Fontname", ASS_STR, offsetof(ASSStyle, font_name) }, + {"Fontsize", ASS_INT, offsetof(ASSStyle, font_size) }, + {"PrimaryColour", ASS_COLOR, offsetof(ASSStyle, primary_color) }, + {"SecondaryColour", ASS_COLOR, offsetof(ASSStyle, secondary_color)}, + {"TertiaryColour", ASS_COLOR, offsetof(ASSStyle, outline_color) }, + {"BackColour", ASS_COLOR, offsetof(ASSStyle, back_color) }, + {"Bold", ASS_INT, offsetof(ASSStyle, bold) }, + {"Italic", ASS_INT, offsetof(ASSStyle, italic) }, + {"BorderStyle", ASS_INT, offsetof(ASSStyle, border_style) }, + {"Outline", ASS_FLT, offsetof(ASSStyle, outline) }, + {"Shadow", ASS_FLT, offsetof(ASSStyle, shadow) }, + {"Alignment", ASS_ALGN, offsetof(ASSStyle, alignment) }, + {"MarginL", ASS_INT, offsetof(ASSStyle, margin_l) }, + {"MarginR", ASS_INT, offsetof(ASSStyle, margin_r) }, + {"MarginV", ASS_INT, offsetof(ASSStyle, margin_v) }, + {"AlphaLevel", ASS_INT, offsetof(ASSStyle, alpha_level) }, + {"Encoding", ASS_INT, offsetof(ASSStyle, encoding) }, {0}, } }, @@ -123,16 +123,16 @@ static const ASSSection ass_sections[] = { .size = sizeof(ASSDialog), .offset = offsetof(ASS, dialogs), .offset_count = offsetof(ASS, dialogs_count), - .fields = {{"Layer", ASS_INT, offsetof(ASSDialog, layer) }, - {"Start", ASS_TIMESTAMP, offsetof(ASSDialog, start) }, - {"End", ASS_TIMESTAMP, offsetof(ASSDialog, end) }, - {"Style", ASS_STR, offsetof(ASSDialog, style) }, - {"Name", ASS_STR, offsetof(ASSDialog, name) }, - {"MarginL", ASS_INT, offsetof(ASSDialog, margin_l) }, - {"MarginR", ASS_INT, offsetof(ASSDialog, margin_r) }, - {"MarginV", ASS_INT, offsetof(ASSDialog, margin_v) }, - {"Effect", ASS_STR, offsetof(ASSDialog, effect) }, - {"Text", ASS_STR, offsetof(ASSDialog, text) }, + .fields = {{"Layer", ASS_INT, offsetof(ASSDialog, layer) }, + {"Start", ASS_TIMESTAMP, offsetof(ASSDialog, start) }, + {"End", ASS_TIMESTAMP, offsetof(ASSDialog, end) }, + {"Style", ASS_STR, offsetof(ASSDialog, style) }, + {"Name", ASS_STR, offsetof(ASSDialog, name) }, + {"MarginL", ASS_INT, offsetof(ASSDialog, margin_l)}, + {"MarginR", ASS_INT, offsetof(ASSDialog, margin_r)}, + {"MarginV", ASS_INT, offsetof(ASSDialog, margin_v)}, + {"Effect", ASS_STR, offsetof(ASSDialog, effect) }, + {"Text", ASS_STR, offsetof(ASSDialog, text) }, {0}, } }, |