lavf: count skipped samples for initial timestamps.
authorNicolas George <nicolas.george@normalesup.org>
Sun, 15 Jul 2012 15:38:28 +0000 (17:38 +0200)
committerNicolas George <nicolas.george@normalesup.org>
Thu, 19 Jul 2012 21:41:03 +0000 (23:41 +0200)
If skip_samples is set and timestamps are synthesized using durations,
make them start at -skip_samples (rescaled) instead of 0,
so that the timestamp of the first undiscarded sample is 0.

libavformat/utils.c

index d6035d9..cfa9e82 100644 (file)
@@ -942,6 +942,10 @@ 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)){