From: Carl Hetherington <cth@carlh.net>
Date: Sun, 12 Sep 2021 20:51:09 +0000 (+0200)
Subject: Add another believed-correct subtitle timing fix.
X-Git-Tag: v2.15.161
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=fc1441eeaa3c0805c37809685ea7a3f5ca173666

Add another believed-correct subtitle timing fix.
---

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 31aa18293..503f8e51c 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -288,7 +288,7 @@ FFmpeg::subtitle_period (AVPacket const* packet, AVStream const* stream, AVSubti
 {
 	auto const packet_time = ContentTime::from_seconds (packet->pts * av_q2d(stream->time_base));
 
-	if (sub.end_display_time == static_cast<uint32_t> (-1)) {
+	if (sub.end_display_time == 0 || sub.end_display_time == static_cast<uint32_t>(-1)) {
 		/* End time is not known */
 		return FFmpegSubtitlePeriod (packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3));
 	}