From 01272e7662b58b549d2e86c06442a6c4bc1d814a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 24 Jul 2012 14:55:30 +0200 Subject: [PATCH] Revert "lavf: count skipped samples for initial timestamps." This reverts commit 885fc058655efee94203314984ce99b301fdebb1. This commit caused timestamps in case of generic seeking to become inconsistent. --- libavformat/utils.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index eef77d0d65..5bc79f4350 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -942,10 +942,6 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, AVPacketList *pktl= s->parse_queue ? s->parse_queue : s->packet_buffer; int64_t cur_dts= RELATIVE_TS_BASE; - if (st->skip_samples && st->codec->sample_rate && st->time_base.num) - cur_dts -= av_rescale_q(st->skip_samples, - (AVRational){ 1, st->codec->sample_rate }, - st->time_base); if(st->first_dts != AV_NOPTS_VALUE){ cur_dts= st->first_dts; for(; pktl; pktl= get_next_pkt(s, st, pktl)){