]> git.sesse.net Git - ffmpeg/commitdiff
avformat/sccdec: display last caption even when there is no empty last line
authorPaul B Mahol <onemda@gmail.com>
Thu, 27 Jun 2019 18:20:16 +0000 (20:20 +0200)
committerPaul B Mahol <onemda@gmail.com>
Thu, 27 Jun 2019 18:20:16 +0000 (20:20 +0200)
libavformat/sccdec.c

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