avformat/utils: Don't calculate duration using AV_NOPTS_VALUE for start_time.

Found by ClusterFuzz, https://crbug.com/879852

Dale Curtis committed 8 years ago

Commit 8ef7fb81 parent 1693a681 file · +1 −1Browse files

Unified · Split

libavformat/utils.c+1−1

@@ -3869,7 +3869,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 3868 unmodified lines
3869	break;	3869	break;
3870	}	3870	}
3871	if (pkt->duration) {	3871	if (pkt->duration) {
3872	if (avctx->codec_type == AVMEDIA_TYPE_SUBTITLE && pkt->pts != AV_NOPTS_VALUE && pkt->pts >= st->start_time) {	3872	if (avctx->codec_type == AVMEDIA_TYPE_SUBTITLE && pkt->pts != AV_NOPTS_VALUE && st->start_time != AV_NOPTS_VALUE && pkt->pts >= st->start_time) {
3873	st->info->codec_info_duration = FFMIN(pkt->pts - st->start_time, st->info->codec_info_duration + pkt->duration);	3873	st->info->codec_info_duration = FFMIN(pkt->pts - st->start_time, st->info->codec_info_duration + pkt->duration);
3874	} else	3874	} else
3875	st->info->codec_info_duration += pkt->duration;	3875	st->info->codec_info_duration += pkt->duration;