Originally committed as revision 9984 to svn://svn.ffmpeg.org/ffmpeg/trunk
Michael Niedermayer authored on 2007/08/09 03:54:33... | ... |
@@ -1922,8 +1922,9 @@ static int av_encode(AVFormatContext **output_files, |
1922 | 1922 |
|
1923 | 1923 |
// 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); |
1924 | 1924 |
if (pkt.dts != AV_NOPTS_VALUE && ist->next_pts != AV_NOPTS_VALUE) { |
1925 |
- int64_t delta= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q) - ist->next_pts; |
|
1926 |
- if(FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE && !copy_ts){ |
|
1925 |
+ int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base, AV_TIME_BASE_Q); |
|
1926 |
+ int64_t delta= pkt_dts - ist->next_pts; |
|
1927 |
+ if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || pkt_dts+1<ist->pts)&& !copy_ts){ |
|
1927 | 1928 |
input_files_ts_offset[ist->file_index]-= delta; |
1928 | 1929 |
if (verbose > 2) |
1929 | 1930 |
fprintf(stderr, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", delta, input_files_ts_offset[ist->file_index]); |