diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-06-15 19:02:41 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-06-29 20:20:02 +0200 |
| commit | 0e7782c08ec77739edb0b98ba5d896b45e98235f (patch) | |
| tree | 9dc2bd3cbb892653dec46db3be97201a4f61408d | |
| parent | a19e9f2d5ca2bcc0f830dcff0866b8bf0300d412 (diff) | |
lavc/ass: honor Default style.
The "Default" style written in the header is ignored unless you explicit
it in the Dialogue events (it was valid, just ignored). This requires an
update of the SubRip test since the ASS output obviously changes.
| -rw-r--r-- | libavcodec/ass.c | 4 | ||||
| -rw-r--r-- | tests/ref/fate/sub-srt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 51e37ac49d..6f1719bc5e 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -38,7 +38,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx, "Style: Default,%s,%d,&H%x,&H%x,&H%x,&H%x,%d,%d,%d,1,1,0,%d,10,10,10,0,0\r\n" "\r\n" "[Events]\r\n" - "Format: Layer, Start, End, Text\r\n", + "Format: Layer, Start, End, Style, Text\r\n", font, font_size, color, color, back_color, back_color, -bold, -italic, -underline, alignment); @@ -82,7 +82,7 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, snprintf(s_end, sizeof(s_end), "9:59:59.99"); else ts_to_string(s_end, sizeof(s_end), ts_start + duration); - len = snprintf(header, sizeof(header), "Dialogue: 0,%s,%s,", + len = snprintf(header, sizeof(header), "Dialogue: 0,%s,%s,Default,", s_start, s_end); } diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt index 5a1466437e..ba5e50a65e 100644 --- a/tests/ref/fate/sub-srt +++ b/tests/ref/fate/sub-srt @@ -1 +1 @@ -03b2a3f7e7e83624c8e4d1b5569df758 +a246a00ed72655cb8db3eaf64a522e0d |