From 965530e156035305c6262dc2f3ce3842fab931a7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 9 Oct 2008 18:28:43 +0000 Subject: [PATCH] Limit discontinuity handling to containers that allow discontinuities. Originally committed as revision 15590 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 817eec30c..38c02cd8f 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2105,7 +2105,8 @@ static int av_encode(AVFormatContext **output_files, } // fprintf(stderr, "next:%"PRId64" dts:%"PRId64" off:%"PRId64" %d\n", ist->next_pts, pkt.dts, input_files_ts_offset[ist->file_index], ist->st->codec->codec_type); - if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE) { + if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE + && (is->iformat->flags & AVFMT_TS_DISCONT)) { int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q); int64_t delta= pkt_dts - ist->next_pts; if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || pkt_dts+1pts)&& !copy_ts){ -- 2.11.0