diff --git a/ffmpeg.c b/ffmpeg.c index 662e84af66..411cad1c45 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2835,8 +2835,8 @@ static int process_input(void) } } else { if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE || - (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) || - pkt_dts+1pts){ + (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) + ) { av_log(NULL, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt.dts, ist->next_dts, pkt.stream_index); pkt.dts = AV_NOPTS_VALUE; } @@ -2844,8 +2844,8 @@ static int process_input(void) int64_t pkt_pts = av_rescale_q(pkt.pts, ist->st->time_base, AV_TIME_BASE_Q); delta = pkt_pts - ist->next_dts; if ( delta < -1LL*dts_error_threshold*AV_TIME_BASE || - (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) || - pkt_pts+1pts) { + (delta > 1LL*dts_error_threshold*AV_TIME_BASE && ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) + ) { av_log(NULL, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt.pts, ist->next_dts, pkt.stream_index); pkt.pts = AV_NOPTS_VALUE; } diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 7e48d50973..225332980d 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -3,7 +3,7 @@ ./tests/data/lavf/lavf.mxf CRC=0x4ace0849 88ab06201db1953329bfb4aa04a4fe05 *./tests/data/lavf/lavf.mxf 553529 ./tests/data/lavf/lavf.mxf -./tests/data/lavf/lavf.mxf CRC=0x86fddf92 +./tests/data/lavf/lavf.mxf CRC=0xdb9bdf92 52c5b74ecfdc48bd77d79a6bbe62d2de *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0x4ace0849