RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/sccdec: display last caption even when there is no empty last line

This commit is contained in:
Paul B Mahol 2019-06-27 20:20:16 +02:00
parent 025fcee6fa
commit 2b15d436db
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/sccdec.c
View File

@ -110,6 +110,7 @@ static int scc_read_header(AVFormatContext *s)
ts_end = (hh2 * 3600LL + mm2 * 60LL + ss2) * 1000LL + fs2 * 33; ts_end = (hh2 * 3600LL + mm2 * 60LL + ss2) * 1000LL + fs2 * 33;
count++; count++;
try_again:
lline = (char *)&line; lline = (char *)&line;
lline += 12; lline += 12;
@ -138,9 +139,13 @@ static int scc_read_header(AVFormatContext *s)
sub->pts = ts_start; sub->pts = ts_start;
sub->duration = FFMAX(1200, ts_end - ts_start); sub->duration = FFMAX(1200, ts_end - ts_start);
memmove(line, line2, sizeof(line)); memmove(line, line2, sizeof(line));
line2[0] = 0;
FFSWAP(ptrdiff_t, len, len2); FFSWAP(ptrdiff_t, len, len2);
} }
if (line[0])
goto try_again;
ff_subtitles_queue_finalize(s, &scc->q); ff_subtitles_queue_finalize(s, &scc->q);
return ret; return ret;