Limit discontinuity handling to containers that allow discontinuities.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2008 18:28:43 +0000 (18:28 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2008 18:28:43 +0000 (18:28 +0000)
Originally committed as revision 15590 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 817eec3..38c02cd 100644 (file)
--- 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+1<ist->pts)&& !copy_ts){