X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsubtitles.c;h=a3240d88a1683ab879318972d721937d7488ec50;hb=99d78e4f424918c6584b358cd98cfc6165c5d158;hp=93c9ef05cf0afe1e3c18ade11014328ca67a3de8;hpb=79025da3f2e7ab047c8f3c0c817952a98480b26b;p=ffmpeg

diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index 93c9ef05cf0..a3240d88a16 100644
--- a/libavformat/subtitles.c
+++ b/libavformat/subtitles.c
@@ -194,6 +194,9 @@ void ff_subtitles_queue_finalize(void *log_ctx, FFDemuxSubtitlesQueue *q)
 {
     int i;
 
+    if (!q->nb_subs)
+        return;
+
     qsort(q->subs, q->nb_subs, sizeof(*q->subs),
           q->sort == SUB_SORT_TS_POS ? cmp_pkt_sub_ts_pos
                                      : cmp_pkt_sub_pos_ts);
@@ -417,7 +420,7 @@ ptrdiff_t ff_subtitles_read_line(FFTextReader *tr, char *buf, size_t size)
         buf[cur++] = c;
         buf[cur] = '\0';
     }
-    if (ff_text_peek_r8(tr) == '\r')
+    while (ff_text_peek_r8(tr) == '\r')
         ff_text_r8(tr);
     if (ff_text_peek_r8(tr) == '\n')
         ff_text_r8(tr);