From 9825a24e5b1c34663d672961ebd2561a009b23e9 Mon Sep 17 00:00:00 2001 From: Rodger Combs Date: Fri, 2 Oct 2015 22:39:24 -0500 Subject: [PATCH] lavf/utils: avoid giving up probing early with long subtitle events Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index dc83608b1f..689473e9fb 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3347,7 +3347,10 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) break; } if (pkt->duration) { - st->info->codec_info_duration += pkt->duration; + if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE && pkt->pts != AV_NOPTS_VALUE && pkt->pts >= st->start_time) { + st->info->codec_info_duration = FFMIN(pkt->pts - st->start_time, st->info->codec_info_duration + pkt->duration); + } else + st->info->codec_info_duration += pkt->duration; st->info->codec_info_duration_fields += st->parser && st->need_parsing && st->codec->ticks_per_frame ==2 ? st->parser->repeat_pict + 1 : 2; } }