Get rid of a fake timestamp discontinuity at the begin of V.VOB.

This solution is not really correct but it is quite simple. Correct would
be to do a second pass over the packets after all the headers have been
collected.

Originally committed as revision 12157 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent ff2635b273
commit 91acf9a8bc
  1. 5
      libavformat/utils.c

@ -641,7 +641,8 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, AVPacket
for(; pktl; pktl= pktl->next){ for(; pktl; pktl= pktl->next){
if(pktl->pkt.stream_index != pkt->stream_index) if(pktl->pkt.stream_index != pkt->stream_index)
continue; continue;
if(pktl->pkt.pts == pktl->pkt.dts && pktl->pkt.dts == AV_NOPTS_VALUE){ if(pktl->pkt.pts == pktl->pkt.dts && pktl->pkt.dts == AV_NOPTS_VALUE
&& !pktl->pkt.duration){
pktl->pkt.pts= pktl->pkt.dts= st->cur_dts; pktl->pkt.pts= pktl->pkt.dts= st->cur_dts;
st->cur_dts += pkt->duration; st->cur_dts += pkt->duration;
pktl->pkt.duration= pkt->duration; pktl->pkt.duration= pkt->duration;
@ -666,7 +667,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
if (den && num) { if (den && num) {
pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num); pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num);
if(pkt->dts == AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE && st->cur_dts == 0) if(st->cur_dts == 0)
update_initial_durations(s, st, pkt); update_initial_durations(s, st, pkt);
} }
} }

Loading…
Cancel
Save