From: Michael Niedermayer Date: Tue, 12 Jun 2012 17:07:25 +0000 (+0200) Subject: lavf: handle data like subtitles in start time calculation. X-Git-Tag: n1.0~2024 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=47695b1d65de52eed7cbceeaa0985fa36d8bc264 lavf: handle data like subtitles in start time calculation. This fixes an issue with a crazy data track starting with a large negative timestamp. It could as well be solved in all user apps, but this is looking attractively simpler ... Signed-off-by: Michael Niedermayer --- diff --git a/libavformat/utils.c b/libavformat/utils.c index 88c7444387..8d33f8dbf8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2045,7 +2045,7 @@ static void update_stream_timings(AVFormatContext *ic) st = ic->streams[i]; if (st->start_time != AV_NOPTS_VALUE && st->time_base.den) { start_time1= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q); - if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { + if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE || st->codec->codec_type == AVMEDIA_TYPE_DATA) { if (start_time1 < start_time_text) start_time_text = start_time1; } else