From a790813739a880a0a86084ec8c4e2d5a6a79c11d Mon Sep 17 00:00:00 2001 From: Hans Carlson Date: Thu, 21 Jun 2018 14:24:36 +0200 Subject: ffmpeg: Treat subtitles like audio and video for non-monotonic dts. Fixes ticket #4450. Fixes ticket #6248. Signed-off-by: Michael Niedermayer --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fftools') diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6dfab64bc7..8d311a9ac8 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -772,7 +772,7 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u - FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1) - FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1); } - if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && + if ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) && pkt->dts != AV_NOPTS_VALUE && !(st->codecpar->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) && ost->last_mux_dts != AV_NOPTS_VALUE) { -- cgit v1.2.3