RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

lavc/ccaption_dec: fix ASS tags

Browse Source
This commit is contained in:
Clément Bœsch 2016-01-10 14:01:14 +01:00
parent e273dade78
commit a43deea861
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/ccaption_dec.c
View File

@ -307,24 +307,24 @@ static int capture_screen(CCaptionSubContext *ctx)
if (prev_font != font[j]) { if (prev_font != font[j]) {
switch (prev_font) { switch (prev_font) {
case CCFONT_ITALICS: case CCFONT_ITALICS:
e_tag = "{/i0}"; e_tag = "{\\i0}";
break; break;
case CCFONT_UNDERLINED: case CCFONT_UNDERLINED:
e_tag = "{/u0}"; e_tag = "{\\u0}";
break; break;
case CCFONT_UNDERLINED_ITALICS: case CCFONT_UNDERLINED_ITALICS:
e_tag = "{/u0}{/i0}"; e_tag = "{\\u0}{\\i0}";
break; break;
} }
switch (font[j]) { switch (font[j]) {
case CCFONT_ITALICS: case CCFONT_ITALICS:
s_tag = "{/i1}"; s_tag = "{\\i1}";
break; break;
case CCFONT_UNDERLINED: case CCFONT_UNDERLINED:
s_tag = "{/u1}"; s_tag = "{\\u1}";
break; break;
case CCFONT_UNDERLINED_ITALICS: case CCFONT_UNDERLINED_ITALICS:
s_tag = "{/u1}{/i1}"; s_tag = "{\\u1}{\\i1}";
break; break;
} }
} }

4
tests/ref/fate/sub-cc
View File

@ -10,5 +10,5 @@ Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10
[Events] [Events]
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,({/i1} inaudible radio chatter{/i0} ) Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,({\i1} inaudible radio chatter{\i0} )
Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,({/i1} inaudible radio chatter{/i0} )\N>> Safety remains our number one Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,({\i1} inaudible radio chatter{\i0} )\N>> Safety remains our number one