Merge commit '58170b027144f4840018c7a60fb8d07924cc6242'

[ffmpeg] / libavformat / subtitles.c

diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index 7c6cd5f3539535f60076d318244830565509fe94..108f909c84872d5b90a3d22024a6300bd8ae932a 100644 (file)
--- a/libavformat/subtitles.c
+++ b/libavformat/subtitles.c
@@ -198,7 +198,7 @@ void ff_subtitles_queue_finalize(void *log_ctx, FFDemuxSubtitlesQueue *q)
           q->sort == SUB_SORT_TS_POS ? cmp_pkt_sub_ts_pos
                                      : cmp_pkt_sub_pos_ts);
     for (i = 0; i < q->nb_subs; i++)
-        if (q->subs[i].duration == -1 && i < q->nb_subs - 1)
+        if (q->subs[i].duration < 0 && i < q->nb_subs - 1)
             q->subs[i].duration = q->subs[i + 1].pts - q->subs[i].pts;
 
     if (!q->keep_duplicates)