dcbill <[EMAIL PROTECTED]> added the comment:
To remind, the patch is 2 lines deleted, 3 added. Is there something here
obviously out of whack, especially on 64-bit machines?
--- trunk/ffmpeg.c (original)
+++ trunk/ffmpeg.c Wed Aug 8 20:54:33 2007
@@ -1922,8 +1922,9 @@ static int av_encode(AVFormatContext **o
// 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) {
- int64_t delta= av_rescale_q(pkt.dts, ist->st->time_base,
AV_TIME_BASE_Q) - ist->next_pts;
- if(FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE &&
!copy_ts){
+ 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){
input_files_ts_offset[ist->file_index]-= delta;
if (verbose > 2)
fprintf(stderr, "timestamp discontinuity %"PRId64", new
offset= %"PRId64"\n", delta, input_files_ts_offset[ist->file_index]);
______________________________________________________
FFmpeg issue tracker <[EMAIL PROTECTED]>
<https://roundup.mplayerhq.hu/roundup/ffmpeg/issue137>
______________________________________________________
