virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc/ass: honor Default style.

Browse Source 
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.
This commit is contained in:
Clément Bœsch 2012-06-15 19:02:41 +02:00
parent a19e9f2d5c
commit 0e7782c08e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ass.c
View File

@ -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" "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" "\r\n"
"[Events]\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, font, font_size, color, color, back_color, back_color,
-bold, -italic, -underline, alignment); -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"); snprintf(s_end, sizeof(s_end), "9:59:59.99");
else else
ts_to_string(s_end, sizeof(s_end), ts_start + duration); 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); s_start, s_end);
} }

2
tests/ref/fate/sub-srt
View File

@ -1 +1 @@
03b2a3f7e7e83624c8e4d1b5569df758 a246a00ed72655cb8db3eaf64a522e0d