[FFmpeg-cvslog] Revert "lavf: count skipped samples for initial timestamps."

Michael Niedermayer git at videolan.org
Tue Jul 24 17:20:31 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 24 14:55:30 2012 +0200| [01272e7662b58b549d2e86c06442a6c4bc1d814a] | committer: Michael Niedermayer

Revert "lavf: count skipped samples for initial timestamps."

This reverts commit 885fc058655efee94203314984ce99b301fdebb1.
This commit caused timestamps in case of generic seeking to become
inconsistent.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01272e7662b58b549d2e86c06442a6c4bc1d814a
---

 libavformat/utils.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index eef77d0..5bc79f4 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)){



More information about the ffmpeg-cvslog mailing list